[Pkg-gnupg-commit] [gnupg2] 95/112: Imported Upstream version 2.1.15
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Tue Aug 30 17:48:27 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg2.
commit d5cdb8993ad48b4ead3e0105344731b87f4d1460
Merge: e676848 6bee88d
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Mon Aug 29 10:09:31 2016 -0400
Imported Upstream version 2.1.15
ChangeLog | 645 +++++++
NEWS | 51 +
README | 13 +-
VERSION | 2 +-
agent/Makefile.am | 2 +-
agent/agent.h | 1 +
agent/cache.c | 13 +-
agent/command-ssh.c | 289 +---
agent/command.c | 13 +-
agent/cvt-openpgp.c | 2 +-
agent/gpg-agent.c | 21 +-
agent/learncard.c | 6 +-
agent/preset-passphrase.c | 10 +-
agent/protect-tool.c | 9 +-
common/Makefile.am | 7 +-
common/asshelp.c | 47 +-
common/exechelp-posix.c | 4 +-
common/exectool.c | 72 +-
common/fwddecl.h | 2 +-
common/homedir.c | 50 +-
common/i18n.c | 6 +-
common/init.c | 8 +
common/iobuf.c | 20 +-
common/keyserver.h | 4 +-
common/logging.c | 5 +-
common/miscellaneous.c | 68 +-
common/sexputil.c | 50 +
common/simple-pwquery.c | 429 ++---
common/simple-pwquery.h | 43 -
common/status-codes.h | 16 +-
common/status.h | 1 +
common/stringhelp.c | 79 +-
common/stringhelp.h | 5 +-
common/t-exectool.c | 223 +++
common/util.h | 11 +-
common/{fwddecl.h => utilproto.h} | 21 +-
common/w32-afunix.c | 148 --
common/w32-afunix.h | 63 -
configure.ac | 6 +-
dirmngr/Makefile.am | 4 +-
dirmngr/cdblib.c | 2 +-
dirmngr/certcache.c | 3 -
dirmngr/crlcache.c | 4 +-
dirmngr/dirmngr.c | 188 +--
dirmngr/dirmngr.h | 2 -
dirmngr/http.c | 13 +-
dirmngr/ldap-wrapper.c | 4 +-
dirmngr/ocsp.c | 6 +-
dirmngr/server.c | 48 +-
dirmngr/t-http.c | 2 +-
dirmngr/validate.c | 12 +-
doc/DETAILS | 72 +-
doc/TRANSLATE | 4 +-
doc/defsincdate | 2 +-
doc/dirmngr.texi | 41 +-
doc/gnupg.info | 355 ++--
doc/gnupg.info-1 | 174 +-
doc/gnupg.info-2 | 154 +-
doc/gpg-agent.texi | 10 +-
doc/gpg.texi | 74 +-
doc/gpgsm.texi | 4 +-
doc/scdaemon.texi | 10 +-
doc/tools.texi | 10 +-
doc/whats-new-in-2.1.txt | 185 +-
g10/encrypt.c | 7 +-
g10/export.c | 2 +-
g10/getkey.c | 2 +-
g10/gpg.c | 69 +-
g10/gpg.h | 2 +
g10/gpgcompose.c | 2 +-
g10/gpgv.c | 25 +-
g10/import.c | 109 +-
g10/keydb.h | 6 +-
g10/keyedit.c | 2 +-
g10/keylist.c | 56 +-
g10/keyring.c | 18 +-
g10/mainproc.c | 38 +-
g10/options.h | 17 +-
g10/packet.h | 3 +-
g10/parse-packet.c | 5 +-
g10/passphrase.c | 233 +--
g10/pkclist.c | 4 +
g10/progress.c | 22 +-
g10/sig-check.c | 4 +-
g10/sign.c | 17 +-
g10/tdbio.c | 4 +-
g10/test-stubs.c | 18 +-
g10/tofu.c | 873 ++--------
g10/tofu.h | 4 +-
g13/Makefile.am | 2 +-
g13/backend.c | 18 +
g13/backend.h | 1 +
g13/be-dmcrypt.c | 17 +
g13/be-dmcrypt.h | 1 +
g13/call-syshelp.c | 143 ++
g13/call-syshelp.h | 6 +
g13/g13-syshelp.c | 9 +-
g13/g13-syshelp.h | 1 +
g13/g13.c | 35 +-
g13/keyblob.c | 22 -
g13/keyblob.h | 3 -
g13/mount.c | 115 +-
g13/server.c | 27 +
g13/server.h | 4 +
g13/sh-cmd.c | 161 +-
g13/sh-dmcrypt.c | 93 ++
g13/suspend.c | 1 +
kbx/kbxutil.c | 10 +-
kbx/keybox-update.c | 38 +-
kbx/keybox-util.c | 92 +-
kbx/keybox.h | 3 +-
m4/ksba.m4 | 6 +-
m4/libgcrypt.m4 | 6 +-
m4/ntbtls.m4 | 8 +-
po/POTFILES.in | 2 +-
po/ca.po | 1626 +++++++++---------
po/cs.po | 1613 +++++++++---------
po/da.po | 1618 +++++++++---------
po/de.po | 1618 +++++++++---------
po/el.po | 1606 +++++++++---------
po/en at boldquot.po | 1559 +++++++++--------
po/en at quot.po | 1559 +++++++++--------
po/eo.po | 1602 +++++++++---------
po/es.po | 1618 +++++++++---------
po/et.po | 1604 +++++++++---------
po/fi.po | 1602 +++++++++---------
po/fr.po | 1618 +++++++++---------
po/gl.po | 1604 +++++++++---------
po/gnupg2.pot | 1544 ++++++++---------
po/hu.po | 1610 +++++++++---------
po/id.po | 1604 +++++++++---------
po/it.po | 1604 +++++++++---------
po/ja.po | 1640 +++++++++---------
po/nb.po | 1762 ++++++++++----------
po/pl.po | 1618 +++++++++---------
po/pt.po | 1606 +++++++++---------
po/ro.po | 1606 +++++++++---------
po/ru.po | 1635 +++++++++---------
po/sk.po | 1604 +++++++++---------
po/sv.po | 1618 +++++++++---------
po/tr.po | 1618 +++++++++---------
po/uk.po | 1616 +++++++++---------
po/zh_CN.po | 1597 +++++++++---------
po/zh_TW.po | 1612 +++++++++---------
scd/app-p15.c | 4 +-
scd/app.c | 4 +
scd/ccid-driver.c | 2 +-
scd/command.c | 96 +-
scd/scdaemon.c | 12 +-
sm/gpgsm.c | 11 +-
sm/keylist.c | 1 -
sm/server.c | 6 +-
sm/sign.c | 2 +-
tests/gpgscm/Makefile.am | 2 +-
tests/gpgscm/ffi-private.h | 2 +-
tests/gpgscm/ffi.c | 29 +-
tests/gpgscm/init.scm | 4 +-
tests/gpgscm/lib.scm | 3 +-
tests/gpgscm/main.c | 2 +-
tests/gpgscm/scheme.c | 2 +-
tests/gpgscm/tests.scm | 42 +-
tests/migrations/Makefile.am | 9 +-
tests/migrations/common.scm | 13 +
tests/migrations/extended-pkf.scm | 3 +
tests/migrations/from-classic.scm | 3 +
.../migrations/{extended-pkf.scm => issue2276.scm} | 33 +-
tests/migrations/issue2276.tar.asc | 326 ++++
tests/openpgp/Makefile.am | 46 +-
tests/openpgp/README | 2 +-
tests/openpgp/armor.scm | 2 +-
tests/openpgp/defs.scm | 18 +-
tests/openpgp/fake-pinentry.c | 6 +-
tests/openpgp/gpg-agent.conf.tmpl | 1 +
tests/openpgp/gpgtar.scm | 4 +-
tests/openpgp/gpgv-forged-keyring.scm | 67 +
.../extended-pkf.scm => openpgp/issue2015.scm} | 30 +-
.../extended-pkf.scm => openpgp/issue2346.scm} | 32 +-
.../extended-pkf.scm => openpgp/issue2417.scm} | 48 +-
.../extended-pkf.scm => openpgp/issue2419.scm} | 33 +-
tests/openpgp/run-tests.scm | 215 +++
tests/openpgp/samplekeys/issue2346.gpg | 57 +
tests/openpgp/samplekeys/ssh-dsa.key | 12 +
tests/openpgp/samplekeys/ssh-ecdsa.key | 5 +
tests/openpgp/samplekeys/ssh-ed25519.key | 7 +
tests/openpgp/samplekeys/ssh-rsa.key | 27 +
tests/openpgp/samplemsgs/issue2419.asc | 7 +
tests/openpgp/setup.scm | 8 -
tests/openpgp/ssh.scm | 66 +
tests/openpgp/tofu.scm | 2 +-
tools/Makefile.am | 19 +-
tools/gpg-check-pattern.c | 9 +-
tools/gpg-connect-agent.c | 2 +-
tools/gpg-wks-client.c | 5 +-
tools/gpg-wks-server.c | 74 +-
tools/gpgconf-comp.c | 4 +-
tools/gpgconf.c | 22 +-
tools/gpgconf.h | 1 +
tools/gpgsplit.c | 2 +-
tools/gpgtar.c | 2 +-
tools/gpgtar.h | 2 +-
tools/symcryptrun.c | 11 +-
201 files changed, 27353 insertions(+), 27061 deletions(-)
diff --cc ChangeLog
index b65921c,8bd68a6..ce3a460
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,12556 -1,16 +1,13201 @@@
-No more ChangeLog files
-========================
++2016-08-18 Werner Koch <wk at gnupg.org>
+
-Do not modify any of the ChangeLog files in GnuPG. Starting on
-December 1st, 2011 we put change information only in the GIT commit
-log, and generate a top-level ChangeLog file from logs at "make dist"
-time. As such, there are strict requirements on the form of the
-commit log messages. See doc/HACKING for details. The old ChangeLog
-files have all be renamed to ChangeLog-2011.
++ Release 2.1.15.
+
++ po: Update German translation.
+
++2016-08-18 Åka Sikrom <a4 at hush.com>
+
-Local Variables:
-buffer-read-only: t
-mode: text
-End:
++ po: Update Norwegian translation.
++
++2016-08-18 Ineiev <ineiev at gnu.org>
++
++ po: Update Russian translation.
++
++2016-08-18 Werner Koch <wk at gnupg.org>
++
++ gpg: Add import filter "drop-sig".
++ * g10/import.c (import_drop_sig): New variable.
++ (cleanup_import_globals): Release that.
++ (parse_and_set_import_filter): Add filter "drop-sig".
++ (filter_getval): Implement properties for drop-sig.
++ (apply_drop_sig_filter): New.
++ (import_one): Apply that filter.
++
++ dirmngr: Remove all system daemon features.
++ * dirmngr/dirmngr.h (opts): Remove fields 'system_service' and
++ 'system_daemon'.
++ * common/homedir.c (dirmngr_sys_socket_name): Remove.
++ (dirmngr_user_socket_name): Rename to ...
++ (dirmngr_socket_name): this. Change call callers.
++ * common/asshelp.c (start_new_dirmngr): Remove the system socket
++ feature.
++ * tools/gpgconf.c (list_dirs): Do not print "dirmngr-sys-socket".
++ * sm/server.c (gpgsm_server): Adjust for removed system socket feature.
++ * dirmngr/server.c (cmd_getinfo): Ditto.
++ (cmd_killdirmngr): Remove check for system daemon.
++ (cmd_reloaddirmngr): Ditto.
++ * dirmngr/dirmngr.c (USE_W32_SERVICE): Remove macro.
++ (aService): Remove.
++ (opts): Remove --service.
++ (w32_service_control): Remove.
++ (real_main, call_real_main) [W32]: Remove wrapper.
++ (main): Remove Windows system service feature. Remove system dameon
++ feature. Use only the "~/.gnupg/dirmngr_ldapservers.conf" file.
++ * dirmngr/certcache.c (load_certs_from_dir): Remove warning in the
++ system dameon case.
++ * dirmngr/crlcache.c (DBDIR_D): Always use "~/.gnupg/crls.d".
++ * dirmngr/ocsp.c (validate_responder_cert): Do not call
++ validate_cert_chain which was used only in system daemon mode.
++ * dirmngr/validate.c (validate_cert_chain): Always use the code.
++
++ gpg: New option --sender.
++ * g10/options.h (struct opt): Add field 'sender_list'.
++ * g10/gpg.c: Include mbox-util.h.
++ (oSender): New.
++ (opts): Add option "--sender".
++ (main): Parse option.
++
++2016-08-16 Werner Koch <wk at gnupg.org>
++
++ agent: Allow import of overly large keys.
++ * agent/command.c (MAXLEN_KEYDATA): Double the size.
++
++2016-08-14 Werner Koch <wk at gnupg.org>
++
++ g13: Allow the use of a g13tab label for --mount.
++ * g13/mount.c (g13_mount_container): Do not run the first access check
++ if syshelp is required.
++
++ g13: Implement --umount for dm-crypt.
++ * g13/g13.c (main): Implement command --umount.
++ * g13/mount.c (g13_umount_container): use the syshelper if needed.
++ * g13/backend.c (be_umount_container): New.
++ * g13/be-dmcrypt.c (be_dmcrypt_umount_container): New.
++ * g13/call-syshelp.c (call_syshelp_run_umount): New.
++ * g13/sh-cmd.c (cmd_umount): New.
++ (register_commands): Register UMOUNT.
++ * g13/sh-dmcrypt.c (sh_dmcrypt_umount_container): New.
++
++2016-08-13 Werner Koch <wk at gnupg.org>
++
++ g13: Fix double free bug.
++ * g13/sh-cmd.c (cmd_mount, cmd_resume): Do not xfree TIUPLES.
++
++ g13: Consider g13tab for a mount command.
++ * g13/sh-cmd.c (cmd_getkeyblob): New.
++ (register_commands): Register it.
++ * g13/call-syshelp.c (getkeyblob_data_cb): New.
++ (call_syshelp_get_keyblob): New.
++ * g13/mount.c: Include callsyshelp.h.
++ (g13_mount_container): Ask syshelp whether the filename is managed by
++ g13tab. Call syshelp to get the encrypted keyblob in this case.
++
++ g13: Move some function around.
++ * g13/keyblob.c (g13_keyblob_decrypt): Move to ...
++ * g13/server.c: to here.
++ * g13/suspend.c, g13/mount.c: Include server.h.
++ * g13/Makefile.am (g13_syshelp_SOURCES): Add keyblob.c
++
++ g13: New command --find-device.
++ * common/status.h (STATUS_BLOCKDEV: New.
++ * g13/call-syshelp.c: Include "call-syshelp.h".
++ (finddevice_status_cb, call_syshelp_find_device): New.
++ * g13/g13.c (aFindDevice): New.
++ (opts): Add "--find-device".
++ (main): Implement --find-device.
++ * g13/sh-cmd.c (cmd_finddevice): New.
++ (register_commands): Register new command.
++
++2016-08-12 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
++
++ Avoid leading ": " in the log output when there are no prefixes.
++ * common/logging.c (do_logv): When no prefixes have been requested,
++ omit the ": " separator, since there is nothing on the left-hand
++ side of it.
++
++ Call log_set_prefix() with human-readable labels.
++ * agent/preset-passphrase.c, agent/protect-tool.c, dirmngr/dirmngr.c
++ * dirmngr/t-http.c, g10/gpg.c, g10/gpgv.c, g13/g13-syshelp.c
++ * g13/g13.c, kbx/kbxutil.c, scd/scdaemon.c, sm/gpgsm.c
++ * tests/gpgscm/main.c, tools/gpg-check-pattern.c
++ * tools/gpg-connect-agent.c, tools/gpgconf.c, tools/gpgtar.c
++ * tools/symcryptrun.c: Invoke log_set_prefix() with
++ human-readable labels.
++
++2016-08-11 Werner Koch <wk at gnupg.org>
++
++ gpg: New option --input-size-hint.
++ * g10/options.h: Include stdint.h.
++ (struct opt): Add field 'input_size_hint'.
++ * g10/gpg.c (oInputSizeHint): New.
++ (opts): Add --input-size-hint.
++ (main): Set opt.input_size_hint.
++ * g10/progress.c (write_status_progress): Use the hint.
++
++ common: New function string_to_u64.
++ * common/stringhelp.c (string_to_u64): New.
++ * dirmngr/http.c (longcounter_t): Remove.
++ (struct cookie_s): Change content_length to uint64_t.
++ (parse_response): Use string_to_u64.
++
++2016-08-11 Justus Winter <justus at g10code.com>
++
++ common: Remove compatibility code.
++ * common/Makefile.am: Drop deleted files.
++ * common/w32-afunix.c: Delete file.
++ * common/w32-afunix.h: Likewise.
++
++ GnuPG-bug-id: 2408
++
++ common: Rework the simple password query module.
++ * common/simple-pwquery.c (writen, readline): Drop.
++ (agent_send_option, agent_send_all_options, agent_open): Just use
++ libassuan.
++ (simple_pw_set_socket): Simplify.
++ (default_inq_cb): New function.
++ (simple_pwquery, simple_query): Just use libassuan.
++ * agent/Makefile.am (gpg_preset_passphrase_LDADD): Add libassuan.
++ * tools/Makefile.am (symcryptrun_LDADD): Likewise.
++
++ common: Remove simple password query error codes.
++ * common/simple-pwquery.h: Remove mapping function. Move all
++ definitions of status codes...
++ * common/simple-pwquery.c: ... here, and define them to meaningful gpg
++ error values.
++ * agent/preset-passphrase.c (preset_passphrase): Use error code as-is.
++ (forget_passphrase): Likewise.
++ * tools/symcryptrun.c (confucius_get_pass): Likewise.
++
++2016-08-10 Werner Koch <wk at gnupg.org>
++
++ gpg: Print the signer's UID during verification.
++ * g10/parse-packet.c (parse_signature): Sanitize the value stored in
++ SIGNERS_UID.
++ * g10/mainproc.c (issuer_fpr_string): New.
++ (check_sig_and_print): Print the signers' UID. Print the issuer
++ fingerprint in --rfc4880bis mode.
++
++ common: New function try_make_printable_string.
++ * common/stringhelp.c (sanitize_buffer): Remove. Move code to ...
++ * common/miscellaneous.c (try_make_printable_string): new.
++ (make_printable_string): Call try_make_printable_string.
++
++2016-08-10 Justus Winter <justus at g10code.com>
++
++ tests: Fix distcheck.
++ * tests/openpgp/issue2417.scm: Copy configuration.
++
++2016-08-10 Werner Koch <wk at gnupg.org>
++
++ gpg: Remove tofu database format "split".
++ * g10/options.h (struct opt): Remove field tofu_db_format.
++ * g10/gpg.h (server_control_s): Add fields tofu.batch_update_ref and
++ tofu.batch_update_started.
++ * g10/gpg.c (parse_tofu_db_format): Remove.
++ (main): Make option --tofu-db-format obsolete.
++ * g10/tofu.c: Major rework. Remove the pretty complicated and slower
++ split format and with that all the caching. Use the dbs struct
++ directly. Move global vars for batch update into CTRL. Change
++ calling conventions of some function to take CTRL or DBS pointers
++ instead of the former low-level database pointer.
++
++2016-08-10 Justus Winter <justus at g10code.com>
++
++ g10: Fix opening of trust database.
++ * g10/tdbio.c (tdbio_set_dbname): This function explicitly checks for
++ the file size, but handled the case of a zero-sized file incorrectly
++ by returning success. Fix this by initializing the database in that
++ case.
++ * tests/openpgp/Makefile.am (XTESTS): Add new test.
++ * tests/openpgp/issue2417.scm: New file.
++
++ GnuPG-bug-id: 2417
++
++ tests: Fix distcheck.
++ * tests/openpgp/Makefile.am (EXTRA_DIST): Explicitly add setup and
++ teardown scripts now that they no longer are included in the list of
++ tests.
++
++ tests: Improve temporary directory handling.
++ * tests/gpgscm/ffi.c (ffi_init): Rename 'mkdtemp'.
++ * tests/gpgscm/tests.scm (mkdtemp): New function that uses a sensible
++ location and template if no arguments are given.
++ (with-temporary-working-directory): Simplify accordingly.
++ (make-temporary-file): Likewise.
++ * tests/openpgp/run-tests.scm (run-tests-parallel-isolated): Likewise.
++ (run-tests-sequential-isolated): Likewise.
++
++ gpgscm: Make the name of foreign functions more unique.
++ * tests/gpgscm/ffi-private.h (ffi_define_function_name): Add another
++ underscore.
++
++ tests: Run each test in a clean environment.
++ * tests/openpgp/Makefile.am (TESTS_ENVIRONMENT): Drop obsolete
++ variables, add 'srcdir', use absolute paths.
++ (TESTS): Rename to 'XTESTS' to avoid emitting the automake test
++ runner. Drop 'setup.scm' and 'finish.scm'.
++ (xcheck): New target that runs 'run-tests.scm', our Scheme test suite
++ runner. It will run each test in a clean environment, isolated from
++ the other tests.
++ (EXTRA_DIST): Adapt accordingly.
++ * tests/openpgp/README: Likewise.
++
++ tests: Make ssh test more robust.
++ * tests/openpgp/ssh.scm: Drop the 'MD5:' which was not printed by
++ previous ssh versions.
++
++2016-08-10 NIIBE Yutaka <gniibe at fsij.org>
++
++ agent: SSH support fix.
++ * agent/command-ssh.c (ssh_handler_request_identities): Keep error
++ message same.
++
++2016-08-09 Werner Koch <wk at gnupg.org>
++
++ agent: Fix regression in recent ssh changes.
++ * agent/command-ssh.c (sexp_key_construct): Lowercase the algo name.
++
++ gpg: Extend the PROGRESS line to give the used unit.
++ * g10/progress.c (write_status_progress): Print the units parameter.
++
++2016-08-09 Ben Kibbey <bjk at luxsci.net>
++
++ Cleanup initialization of libgcrypt.
++ * common/init.c (init_common_subsystems): Initialize libgcrypt.
++ * dirmngr/Makefile.am (dirmngr_ldap): Link with libgcrypt.
++
++2016-08-09 NIIBE Yutaka <gniibe at fsij.org>
++
++ agent: SSH support improvement.
++ * agent/command-ssh.c (ssh_handler_request_identities): Skip a key with
++ error, not giving up to handle the request itself.
++ * agent/cvt-openpgp.c (extract_private_key): Support "ecdsa" key.
++
++2016-08-08 Werner Koch <wk at gnupg.org>
++
++ gpg: Cleanup of dek_to_passphrase function (part 2).
++ * g10/passphrase.c (passphrase_get): Remove arg KEYID. Change arg
++ MODE to NOCACHE.
++ (passphrase_to_dek): Remove args KEYID and PUBKEY_ALGO. Split arg
++ MODE into CREATE and NOCACHE. Change all callers and adjust stubs.
++ (passphrase_clear_cache): Remove args KEYID and ALGO. They are not
++ used. Change caller.
++
++ gpg: Cleanup of dek_to_passphrase function (part 1).
++ * g10/passphrase.c (passphrase_to_dek_ext): Remove args CUSTDESC and
++ CUSTPROMPT. Merge into the passphrase_to_dek wrapper.
++ (passphrase_get): Remove args CUSTOM_DESCRIPTION and CUSTOM_PROMPT.
++
++2016-08-08 NIIBE Yutaka <gniibe at fsij.org>
++
++ agent: More clean up of SSH support.
++ * common/util.h (get_pk_algo_from_key): New.
++ * common/sexputil.c (get_pk_algo_from_key): The implementation.
++ * agent/gpg-agent.c: Remove include of openpgpdefs.h.
++ * agent/command-ssh.c (struct ssh_key_type_spec): Use integer ALGO.
++ (ssh_key_types): Update with GCRY_PK_*.
++ (make_cstring, sexp_extract_identifier): Remove.
++ (sexp_key_construct): Use gcry_pk_algo_name to get ALGO string.
++ (ssh_key_to_blob): Use cadr to get value list.
++ (ssh_key_type_lookup): Lookup with integer ALGO.
++ (ssh_receive_key): Follow the change of ssh_key_type_lookup.
++ (ssh_send_key_public): Likewise. Use get_pk_algo_from_key to get ALGO.
++
++ tests: Add openpgp/gpgv-forged-keyring.scm.
++ * tests/openpgp/gpgv-forged-keyring.scm: New.
++ * tests/openpgp/forged-keyring.gpg: New.
++ * tests/openpgp/Makefile.am (TESTS): Add gpgv-forged-keyring.scm.
++ * tests/openpgp/defs.scm (tools): Add GPGV.
++ (GPGV): New.
++
++2016-08-06 Werner Koch <wk at gnupg.org>
++
++ agent: Fix long standing regression tracking the connection count.
++ * agent/gpg-agent.c (get_agent_active_connection_count): New.
++ (do_start_connection_thread, start_connection_thread_ssh): Bump
++ ACTIVE_CONNECTIONS up and down.
++ * agent/command.c (cmd_getinfo): Add subcommand "connections".
++
++2016-08-06 NIIBE Yutaka <gniibe at fsij.org>
++
++ agent: Clean up SSH support.
++ * agent/command-ssh.c (file_to_buffer): Remove.
++ (ssh_handler_request_identities): Use agent_public_key_from_file.
++
++2016-08-05 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
++
++ gpg: Avoid publishing the GnuPG version by default.
++ * g10/gpg.c (main): initialize opt.emit_version to 0
++ * doc/gpg.texi: document different default for --emit-version
++
++2016-08-04 Werner Koch <wk at gnupg.org>
++
++ gpg: Make sure that keygrips are printed for each subkey.
++ * g10/keylist.c (list_keyblock_colon): Print an emprty grip in case of
++ an error.
++
++ gpg: Always print the fingerprint in colons mode.
++ * g10/keylist.c (list_keyblock_colon): Remove arg FPR. Always print
++ fingerprint records. For secret keys always print keygrip records.
++
++ tests: Use gpgconf to set the ssh socket envvar.
++ * tests/openpgp/ssh.scm ("SSH_AUTH_SOCK"): Use gpgconf.
++
++ gpgconf: Add limited support for -0.
++ * tools/gpgconf.h (opt): Add field 'null'.
++ * tools/gpgconf.c: Add option --null/-0.
++ (list_dirs): Use it here.
++
++2016-08-04 Justus Winter <justus at g10code.com>
++
++ tests: Update list of tests in Scheme test runner.
++ * tests/openpgp/run-tests.scm: Add missing tests.
++
++ tests: Fix path to fake-pinentry.
++ * tests/openpgp/defs.scm: Correctly compute the path to fake-pinentry.
++
++2016-08-04 NIIBE Yutaka <gniibe at fsij.org>
++
++ po: Update Japanese translation.
++
++ po: update Japanese translation.
++
++ g10: Fix checking key for signature validation.
++ * g10/sig-check.c (check_signature2): Not only subkey, but also primary
++ key should have flags.valid=1.
++
++2016-08-03 Justus Winter <justus at g10code.com>
++
++ kbx: Add missing header file.
++ * kbx/keybox-update.c: Add missing header file.
++
++2016-08-03 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
++
++ More cleanup of "allow to".
++ * README, agent/command.c, agent/keyformat.txt, common/i18n.c,
++ common/iobuf.c, common/keyserver.h, dirmngr/cdblib.c,
++ dirmngr/ldap-wrapper.c, doc/DETAILS, doc/TRANSLATE,
++ doc/announce-2.1.txt, doc/gpg.texi, doc/gpgsm.texi,
++ doc/scdaemon.texi, doc/tools.texi, doc/whats-new-in-2.1.txt,
++ g10/export.c, g10/getkey.c, g10/import.c, g10/keyedit.c, m4/ksba.m4,
++ m4/libgcrypt.m4, m4/ntbtls.m4, po/ca.po, po/cs.po, po/da.po,
++ po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/fi.po,
++ po/fr.po, po/gl.po, po/hu.po, po/id.po, po/it.po, po/ja.po,
++ po/nb.po, po/pl.po, po/pt.po, po/ro.po, po/ru.po, po/sk.po,
++ po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po,
++ scd/app-p15.c, scd/ccid-driver.c, scd/command.c, sm/gpgsm.c,
++ sm/sign.c, tools/gpgconf-comp.c, tools/gpgtar.h: replace "Allow to"
++ with clearer text.
++
++ In standard English, the normal construction is "${XXX} allows ${YYY}
++ to" -- that is, the subject (${XXX}) of the sentence is allowing the
++ object (${YYY}) to do something. When the object is missing, the
++ phrasing sounds awkward, even if the object is implied by context.
++ There's almost always a better construction that isn't as awkward.
++
++ These changes should make the language a bit clearer.
++
++ dirmngr: Emit correct spelling of "superseded".
++ * dirmngr/crlcache.c (list_one_crl_entry): Spell superseded correctly.
++ * dirmngr/ocsp.c (ocsp_invalid): Likewise.
++
++ This might break some tools which parse the existing output and expect
++ misspellings, but i'm not sure there are many such tools, and we
++ should use standardized orthography going forward.
++
++ Fix spelling and grammar.
++ * agent/learncard.c: s/coccured/occurred/
++ * doc/dirmngr.texi: s/ommitted/omitted/, s/orginally/originally/,
++ s/reponses/responses/i
++ * doc/gpg-agent.texi, doc/dirmngr.texi, doc/gpg.texi: Fix "allows
++ to" to more conventional english usage.
++ * doc/tools.texi, g10/gpgcommpose.c, tests/openpgp/armor.scm,
++ tests/openpgp/armor.test: s/occured/occurred/
++ * tools/gpgsplit.c: s/calcualting/calculating/
++ * sm/server.c: s/formated/formatted/
++
++2016-08-03 Werner Koch <wk at gnupg.org>
++
++ gpg,gpgsm: Block signals during keyring/keybox update.
++ * kbx/keybox-util.c (keybox_file_rename): Add arg BLOCK_SIGNALS.
++ * kbx/keybox-update.c (rename_tmp_file): Block all signals when doing
++ a double rename.
++ * g10/keyring.c (rename_tmp_file): Block all signals during the double
++ rename.
++
++ common: New file utilproto.c.
++ * common/util.h: Factor prototypes from signal.c out to ...
++ * common/utilproto.h: new.
++ * common/Makefile.am (common_sources): Add new file.
++
++2016-08-01 Justus Winter <justus at g10code.com>
++
++ gpgsm: Fix machine-readable key listing.
++ * sm/keylist.c (list_cert_colon): Drop superfluous colon.
++
++ GnuPG-bug-id: 2432
++
++ tests: Distribute standalone test runner.
++ * tests/openpgp/Makefile.am (EXTRA_DIST): Add missing file
++ 'run-tests.scm'.
++
++ GnuPG-bug-id: 2431
++
++2016-07-28 Justus Winter <justus at g10code.com>
++
++ tests: Fix distcheck.
++ * tests/openpgp/Makefile.am (sample_msgs): New variable.
++ (EXTRA_DIST): Also ship the sample msgs.
++
++2016-07-27 Fredrik Fornwall <fredrik at fornwall.net>
++
++ build: Fix check for Android.
++ * configure.ac: Match other Android targets as well.
++
++2016-07-26 Justus Winter <justus at g10code.com>
++
++ common: Fix iobuf_peek corner case.
++ Previously, iobuf_peek on a file smaller than 'buflen' would hang.
++
++ * common/iobuf.c (underflow): Generalize by adding a target parameter.
++ (iobuf_peek): Use this to prevent looping here.
++ * tests/openpgp/Makefile.am (TESTS): Add new test.
++ * tests/openpgp/setup.scm (dearmor): Move function...
++ * tests/openpgp/defs.scm (dearmor): ... here.
++ * tests/openpgp/issue2419.scm: New file.
++ * tests/openpgp/samplemsgs/issue2419.asc: Likewise.
++
++ GnuPG-bug-id: 2419
++
++ gpgscm: Do not shadow common function name in catch macro.
++ * tests/gpgscm/init.scm (catch): Do not shadow 'exit'.
++
++ tests: Fix distcheck.
++ * tests/openpgp/Makefile.am (samplekeys): Add missing key.
++
++ Fixes-commit: 4ba11251
++
++ gpgscm: Make the verbose setting more useful.
++ * tests/gpgscm/ffi.c (do_get_verbose): New function.
++ (do_set_verbose): Likewise.
++ (ffi_init): Turn *verbose* into a function, add *set-verbose!*.
++ * tests/gpgscm/tests.scm (call): Adapt accordingly.
++ (call-with-io): Dump output if *verbose* is high.
++ (pipe-do): Adapt accordingly.
++ * tests/openpgp/defs.scm: Set verbosity according to environment.
++ * tests/openpgp/run-tests.scm (test): Adapt accordingly.
++
++ common: Avoid excessive stack use.
++ * common/exectool.c (copy_buffer_shred): Make passing NULL a nop.
++ (gnupg_exec_tool_stream): Allocate copy buffers from the heap.
++
++ common: Rework resource cleanup when handling errors.
++ * common/exectool.c (gnupg_exec_tool_stream): Rework error handling.
++
++ common: Add unit test for exectool.
++ * common/Makefile.am: Build new test.
++ * common/t-exectool.c: New file.
++
++2016-07-25 Justus Winter <justus at g10code.com>
++
++ g10: Fix key import statistics.
++ 'transfer_secret_keys' collects statistics on a subkey-basis, while
++ the other code does not. This leads to inflated numbers when
++ importing secret keys. E.g. 'count' is incremented by the main
++ parsing loop in 'import', and again in 'transfer_secret_keys', leading
++ to a total of 3 if one key with two secret subkeys is imported.
++
++ * g10/import.c (import_secret_one): Adjust to the fact that
++ 'transfer_secret_keys' collects subkey statistics.
++ * tests/openpgp/Makefile.am (TESTS): Add new test.
++ * tests/openpgp/issue2346.scm: New file.
++ * tests/openpgp/samplekeys/issue2346.gpg: Likewise.
++
++ GnuPG-bug-id: 2346
++
++2016-07-22 Justus Winter <justus at g10code.com>
++
++ gpgscm: Make function more general.
++ * tests/gpgscm/tests.scm (in-srcdir): Accept more path fragments.
++
++ g10: Properly ignore legacy keys in the keyring cache.
++ * g10/keyring.c (keyring_rebuild_cache): Properly ignore legacy keys
++ in the keyring cache.
++ * tests/migrations/Makefile.am (TESTS): Add new test.
++ * tests/migrations/common.scm (GPG-no-batch): New variable.
++ (run-test): New function.
++ * tests/migrations/issue2276.scm: New file.
++ * tests/migrations/issue2276.tar.asc: Likewise.
++
++ GnuPG-bug-id: 2276
++
++2016-07-21 Justus Winter <justus at g10code.com>
++
++ g10: Fix error handling.
++ * g10/tofu.c (show_statistics): Fix error handling, 0 is a valid
++ duration.
++
++ g10: Drop superfluous begin transaction.
++ * g10/tofu.c (record_binding): We only need a transaction for the
++ split format.
++
++ gpgscm: Make assert macro more accurate.
++ * tests/gpgscm/lib.scm (assert): Print the representation of the
++ failed expression.
++
++ gpgscm: Make error message more useful.
++ * tests/gpgscm/scheme.c (opexe_0): Include names of missing function
++ parameters in the error message.
++
++ g10: Fix crash.
++ * g10/tofu.c (tofu_closedbs): Fix freeing database handles up to the
++ cache limit. Previously, this would crash if db_cache_count == count.
++
++ Reported-by: Ben Kibbey <bjk at luxsci.net>
++
++2016-07-20 NIIBE Yutaka <gniibe at fsij.org>
++
++ scd: Fix card removal/reset on multiple contexts.
++ * scd/app.c (application_notify_card_reset): Add message for debug.
++ *scd/command.c (update_card_removed): Call release_application and set
++ SLOT -1 here.
++ (struct server_local_s): Remove app_ctx_marked_for_release.
++ (do_reset): Don't mark release but call release_application here.
++ (open_card): Remove app_ctx_marked_for_release handling.
++ (update_reader_status_file): Don't set SLOT here, so that it can be
++ released the APP by application_notify_card_reset in
++ update_card_removed.
++
++2016-07-19 Justus Winter <justus at g10code.com>
++
++ agent: Add known keys to sshcontrol.
++ * agent/command-ssh.c (ssh_identity_register): Add a key to sshcontrol
++ even if it is already in the private key store.
++ * tests/openpgp/ssh.scm: Test this.
++
++ GnuPG-bug-id: 2316
++
++ tests: Add test for ssh support.
++ * tests/gpgscm/tests.scm (path-expand): New function.
++ * tests/openpgp/Makefile.am (TESTS): Add new test.
++ (sample_keys): Add new keys.
++ (CLEANFILES): Clean ssh socket and control file.
++ * tests/openpgp/fake-pinentry.c (main): Add a default passphrase.
++ * tests/openpgp/gpg-agent.conf.tmpl: Enable ssh support.
++ * tests/openpgp/samplekeys/ssh-dsa.key: New file.
++ * tests/openpgp/samplekeys/ssh-ecdsa.key: Likewise.
++ * tests/openpgp/samplekeys/ssh-ed25519.key: Likewise.
++ * tests/openpgp/samplekeys/ssh-rsa.key: Likewise.
++ * tests/openpgp/ssh.scm: Likewise.
++
++2016-07-19 NIIBE Yutaka <gniibe at fsij.org>
++
++ scd: Fix race conditions for release_application.
++ * scd/command.c (do_reset, cmd_restart): Reset app_ctx before calling
++ release_application.
++
++2016-07-18 Justus Winter <justus at g10code.com>
++
++ agent: Fix passphrase cache lookups.
++ CACHE_MODE_ANY is supposed to match any cache mode except
++ CACHE_MODE_IGNORE, but the code used '==' to compare cache modes.
++
++ * agent/cache.c (cache_mode_equal): New function.
++ (agent_set_cache): Use the new function to compare cache modes.
++ (agent_get_cache): Likewise.
++ * tests/openpgp/Makefile.am (TESTS): Add new test.
++ * tests/openpgp/issue2015.scm: New file.
++
++ GnuPG-bug-id: 2015
++
++2016-07-15 Justus Winter <justus at g10code.com>
++
++ build: Always build gpgtar.
++ We use gpgtar to unpack test data, hence we always build it. If the
++ user opts out, we simply don't install it.
++
++ * configure.ac: Add comment.
++ * tests/migrations/Makefile.am (required_pgms): Make sure gpgtar is
++ built.
++ * tools/Makefile.am: Always build gpgtar, but do not install it if the
++ user used '--disable-gpgtar'.
++
++2016-07-15 Werner Koch <wk at gnupg.org>
++
++ wks: Publish as binary file.
++ * tools/gpg-wks-server.c (copy_key_as_binary): New.
++ (check_and_publish): Use new function instead of rename.
++
++2016-07-15 Justus Winter <justus at g10code.com>
++
++ gpgscm: Fix linking.
++ * tests/gpgscm/Makefile.am: Add -lintl.
++
++ g10: Fix building without trust models.
++ * g10/pkclist.c (write_trust_status): Fall back to the previous
++ behavior.
++
++ Fixes-commit: ae188932
++
++ tests: Check for gpgtar.
++ * tests/migrations/extended-pkf.scm: Skip test if gpgtar is not built.
++ * tests/migrations/from-classic.scm: Likewise.
++ * tests/openpgp/gpgtar.scm: Fix check for gpgtar.
++
+2016-07-14 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.14.
+
+ po: Update the German translation.
+
+2016-07-14 Damien Goutte-Gattat <dgouttegattat at incenp.org>
+
+ dirmngr: fix handling of HTTP redirections.
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Reinitialize HTTP session
+ when following a HTTP redirection.
+
+2016-07-14 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove options --print-dane-records and --print-pka-records.
+ * g10/gpg.c (main): Remove options but print a dedicated warning.
+ * g10/options.h (struct opt): Remove fields 'print_dane_records' and
+ 'print_pka_records'.
+ * g10/keylist.c (list_keyblock): Do not call list_keyblock_pka.
+ (list_keyblock_pka): Remove.
+
+2016-07-14 Åka Sikrom <a4 at hush.com>
+
+ po: Complete update of the Norwegian translation.
+
+2016-07-14 Yuri Chornoivan <yurchor at ukr.net>
+
+ Update Ukrainian translation.
+
+2016-07-14 Ineiev <ineiev at gnu.org>
+
+ Update Russian translation.
+
+2016-07-14 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix regression since 2.1 in --search-key with a fingerprint.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_search): Prefix fingerprint with 0x.
+
+ gpgscm: Use kludge to avoid improper use of ffi_schemify_name.
+ * tests/gpgscm/ffi.c (ffi_schemify_name): Use xstrdup instead of
+ strdup for now.
+
+ build: Require latest released libraries.
+ * agent/protect.c (OCB_MODE_SUPPORTED): Remove macro.
+ (do_encryption): Always support OCB.
+ (do_decryption): Ditto.
+ (agent_unprotect): Ditto.
+ * dirmngr/server.c (is_tor_running): Unconditionally build this.
+
+2016-07-13 Werner Koch <wk at gnupg.org>
+
+ build: Update config.{guess,sub} to {2016-05-15,2016-06-20}.
+ * build-aux/config.guess: Update.
+ * build-aux/config.sub: Update.
+
+ gpg: Fix regression due to the new --mimemode options.
+ * g10/gpg.c (opts): Re-add oTextmodeShort.
+
+2016-07-13 Daiki Ueno <ueno at gnu.org>
+
+ gpg: Make --try-all-secrets work for hidden recipients.
+ * g10/getkey.c (enum_secret_keys): Really enumerate all secret
+ keys if --try-all-secrets is specified.
+
+2016-07-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Do not print a the short keyid if the high word is zero.
+ * g10/keyid.c (format_keyid): Always returh long keyid ifor KF_LONG.
+
+ gpg: New option --mimemode.
+ * g10/gpg.c (oMimemode): New.
+ (opts): Add --mimemode.
+ (main): Use --mimemode only in rfc4880bis compliance mode.
+ * g10/options.h (struct opt): Add field "mimemode".
+ * g10/build-packet.c (do_plaintext): Allow for mode 'm'.
+ * g10/encrypt.c (encrypt_simple, encrypt_crypt): Use 'm' if requested.
+ * g10/plaintext.c (handle_plaintext): Handle 'm' mode.
+ * g10/sign.c (write_plaintext_packet): Handle 'm' mode.
+ (sign_file, sign_symencrypt_file): Use 'm' if requested.
+
+ wks: Use correct key for the confirmation.
+ * tools/gpg-wks-client.c (send_confirmation_response): Actually
+ encrypt to the recipient.
+
+ wks: New server command --list-domains.
+ * tools/gpg-wks-server.c (aListDomains): New.
+ (opts): Add --list-domains.
+ (parse_arguments): Implement.
+ (main): Ditto. Use only one final diagnostic message.
+ (command_list_domains): New.
+ (check_and_publish): Remove directory creation.
+ (get_domain_list): New.
+ (expire_pending_confirmations): Rewrite using a list of directories.
+ (command_cron): Get domain list and pass to
+ expire_pending_confirmations.
+
+2016-07-13 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix envvars for UPDATESTARTUPTTY.
+ agent/command.c (cmd_updatestartuptty): Use session_env_list_stdenvnames
+ to get the list.
+
+2016-07-12 Werner Koch <wk at gnupg.org>
+
+ g13: Fix memleak.
+ * g13/g13tuple.c (create_tupledesc): Init refcount to 1.
+
+ wks: Add --cron command to gpg-wks-server.
+ * tools/gpg-wks-server.c (PENDING_TTL): New.
+ (expire_one_domain, expire_pending_confirmations): New.
+ (command_cron): New.
+ (main): Implement --cron.
+
+ wks: Try to send an encrypted confirmation back.
+ * tools/gpg-wks-client.c (encrypt_response_status_cb): New.
+ (encrypt_response): New.
+ (send_confirmation_response): Encrypt the response.
+
+ * tools/gpg-wks-server.c (send_confirmation_request): Use freeing of
+ BODY and BODYENC.
+
+ wks: Also create DANE record.
+ * tools/gpg-wks-server.c (copy_key_as_dane): New.
+ (check_and_publish): Also publish as DANE record.
+
+ gpg: Extend import-option import-export to print PKA or DANE.
+ * g10/export.c (do_export_stream): Move PKA and DANE printing helper
+ code to ...
+ (print_pka_or_dane_records): this fucntion.
+ (write_keyblock_to_output): Add arg OPTIOSN and call
+ print_pka_or_dane_records if requested.
+
+ gpg: Move a function from import.c to export.c.
+ * g10/import.c (write_keyblock_to_output): Move to ...
+ * g10/export.c (write_keyblock_to_output): here. Add arg WITH_ARMOR.
+ Also make sure never to export ring trust packets.
+
+2016-07-11 Werner Koch <wk at gnupg.org>
+
+ gpgconf: Enhance --list-dirs.
+ * tools/gpgconf.c (main) <aListDir>: Factor code out to ...
+ (list_dirs): new. Rewrite to use a table. Allow selection of a
+ items. Add "agent-ssh-socket".
+
+2016-07-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ gpgv: Tweak default options for extra security.
+ * g10/gpgv.c (main): Set opt.no_sig _cache, so that it doesn't depend on
+ cached status. Similarly, set opt.flags.require_cross_cert for backsig
+ validation for subkey signature.
+
+2016-07-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Add export options "export-pka" and "export-dane".
+ * g10/options.h (EXPORT_PKA_FORMAT): New.
+ * g10/keylist.c (list_keyblock_pka): Do not use DANE flag.
+ * g10/export.c: Include zb32.h.
+ (parse_export_options): Add options "export-pka" and "export-dane".
+ (do_export): Do not armor if either of these option is set.
+ (print_pka_or_dane_records): New.
+ (do_export_stream): Implement new options.
+
+ gpg: Split a too large export function.
+ * g10/export.c (do_export_stream): Factor some code out to ...
+ (do_export_one_keyblock): new.
+
+2016-07-07 Justus Winter <justus at g10code.com>
+
+ gpgscm: Capture output of spawned processes.
+ * tests/gpgscm/tests.scm (call-check): Capture stdout and stderr, and
+ return stdout if the child exited successfully, or include stderr in
+ the error.
+ * tests/openpgp/version.scm: Demonstrate this by checking the stdout.
+
+2016-07-06 Werner Koch <wk at gnupg.org>
+
+ doc: Escape file names in generated macros.
+ * doc/mkdefsinc.c (print_filename): New.
+ (main): Use it here.
+
+ wks: Let the server take the encrytion key from the file.
+ * tools/gpg-wks-server.c (encrypt_stream): Change arg 'fingerprint' to
+ 'keyfile'.
+ (store_key_as_pending): Add arg 'r_fname' to make of the keyfile.
+ (send_confirmation_request): Add arg 'keyfile'.
+ (process_new_key): Pass on the name of the keyfile.
+
+ gpg: New options --recipient-file and --hidden-recipient-file.
+ * g10/gpg.c (oRecipientFile, oHiddenRecipientFile): New.
+ (opts): Add options --recipient-file and --hidden-recipient-file.
+ (main): Implement them. Also remove duplicate code from similar
+ options.
+ * g10/keydb.h (PK_LIST_FROM_FILE): New.
+ (PK_LIST_SHIFT): Bump up.
+ * g10/pkclist.c (expand_group): Take care of PK_LIST_FROM_FILE.
+ (find_and_check_key): Add and implement arg FROM_FILE.
+ (build_pk_list): Pass new value for new arg.
+ * g10/getkey.c (get_pubkey_fromfile): New.
+ * g10/gpgv.c (read_key_from_file): New stub.
+ * g10/test-stubs.c (read_key_from_file): New stub.
+ * g10/server.c (cmd_recipient): Add flag --file.
+ * g10/import.c (read_key_from_file): New.
+
+ * tests/openpgp/defs.scm (key-file1): New.
+ (key-file2): New.
+ * tests/openpgp/setup.scm: Add their private keys and import the
+ key-file1.
+ * tests/openpgp/encrypt.scm: Add new test.
+
+ gpg: New option --no-keyring.
+ * g10/gpg.c (oNoKeyring): New.
+ (opts): Add "--no-keyring".
+ (main): Do not register any keyring if the option is used.
+
+ gpg: Document use of node flags in import.c and remove unused args.
+ * g10/import.c (NODE_GOOD_SELFSIG): New. Use instead of 1.
+ (NODE_BAD_SELFSIG): New. Use instead of 2.
+ (NODE_DELETION_MARK): New. Use instead of 4.
+ (NODE_FLAG_A): New. Use to mark new nodes in merge_blocks.
+ (chk_self_sigs): Remove unused args FNAME and PK.
+ (import_one): Adjust call. Simplify error return because
+ chk_self_sigs does not return an error code.
+ (append_uid, append_key, merge_sigs, merge_keysigs): Remove unsued
+ args FNAME and KEYID.
+ (merge_blocks, import_one, import_secret_one)
+ (import_revoke_cert): Remove unused arg FNAME.
+
+ gpg: Get rid of an unused arg in a function in getkey.c.
+ * g10/getkey.c (pk_from_block): Remove unused arg CTX. Change all
+ callers.
+
+ gpg: Change calling convention for a function in getkey.c.
+ * g10/getkey.c (merge_selfsigs): Remove arg CTX. Add args REQ_USAGE
+ and WANT_EXACT.
+ (finish_lookup): Adjust caller. Set LOOKUP_NOT_SELECTED here...
+ (lookup): and not here.
+
+2016-07-05 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix possible out-of-bounds read in is_armored.
+ * g10/armor.c (check_input): Call is_armored only if LEN >= 2.
+ (unarmor_pump): Use a 2 byte buffer for is_armored.
+
+2016-07-05 Justus Winter <justus at g10code.com>
+
+ tests: Honor environment variable 'TMP'.
+ This fixes problems with long socket names, e.g. when doing distcheck.
+
+ * tests/gpgscm/tests.scm (path-join): New function.
+ (with-temporary-working-directory): Honor 'TMP'.
+ (make-temporary-file): Likewise.
+ * tests/migrations/Makefile.am (TMP): Default to '/tmp'.
+ (TESTS_ENVIRONMENT): Set 'TMP'.
+ * tests/openpgp/Makefile.am (TMP): Default to '/tmp'.
+ (TESTS_ENVIRONMENT): Set 'TMP'.
+
+ gpgscm: Improve robustness and compatibility.
+ * tests/gpgscm/ffi.c (do_getenv): Avoid gccism.
+ (do_mkdtemp): Handle errors.
+
+ tests/migrations: Fix distcheck.
+ * tests/migrations/Makefile.am (TESTS): Rename test.
+ (TEST_FILES): Update list.
+ (EXTRA_DIST): Add common.scm.
+ * tests/migrations/common.scm (GPGTAR): New variable.
+ (dearmor): Rename and untar archive.
+ * tests/migrations/extended-private-key-format.scm: Rename.
+ (setup): Update.
+ * tests/migrations/extended-pkf.tar.asc: New file.
+ * tests/migrations/extended-private-key-format.gpghome: Delete.
+ * tests/migrations/from-classic.gpghome: Likewise.
+ * tests/migrations/from-classic.scm (setup): Update.
+ * tests/migrations/from-classic.tar.asc: New file.
+
+ tools/gpgtar: Provide --create and --extract.
+ * tools/gpgtar.c (cmd_and_opt_values): New values.
+ (opts): New actions.
+ (parse_arguments): Handle new actions.
+ * tests/openpgp/gpgtar.scm: Test new interface.
+
+ g10: Fix out-of-bounds read.
+ * g10/armor.c (use_armor_filter): We need two bytes for 'is_armored'.
+
+2016-07-04 Werner Koch <wk at gnupg.org>
+
+ wks: Add command --read to gpg-wks-client.
+ * tools/gpg-wks-client.c (aRead): New.
+ (opts): Add command "--read".
+ (main): Implement that.
+
+ tests: Add a gettime test for sizeof (time_t) > 4.
+ * common/t-gettime.c (test_isotime2epoch): Add 4 more tests.
+
+2016-07-03 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid spurious failures on keyblocks with no or only deleted nodes.
+ * g10/import.c (write_keyblock_to_output): Clear ERR on success.
+
+ wks: Let the client only export the requested UID.
+ * tools/gpg-wks-client.c (get_key): Export only the requested uid.
+
+ tools: Call sendmail directly from the wks tools.
+ * tools/send-mail.c, tools/send-mail.h: New.
+ * tools/wks-util.c: New.
+ * tools/Makefile.am (gpg_wks_server_SOURCES): Add them.
+ (gpg_wks_client_SOURCES): Ditto.
+ * tools/gpg-wks.h (opt): Add fields use_sendmail and output.
+ * tools/gpg-wks-client.c: Add options --send and --output. Rename
+ command --send to --create.
+ (command_send, send_confirmation_response): Output via wks_send_mime.
+ * tools/gpg-wks-server.c: Add options --send and --output.
+ (send_confirmation_request): Output via wks_send_mime.
+ (check_and_publish): Add hack for name-value bug.
+
+2016-07-02 Werner Koch <wk at gnupg.org>
+
+ tools: Add options to gpg-wks-server.
+ * tools/gpg-wks.h (opt): Add 'default_from' and 'extra_headers'.
+ * tools/gpg-wks-server.c (oFrom, oHeader): New.
+ (parse_arguments): Set them and check args.
+ (get_submission_address): New.
+ (send_confirmation_request): Set correct From address. Add extra
+ headers.
+ (process_new_key): Return an error code.
+
+ tools: Extend mime-maker.c:mime_maker_add_header.
+ * tools/mime-maker.c (add_header): Check header name and allow
+ name-value syntax.
+ (mime_maker_add_header): Add mode for a syntax check.
+
+ doc: Describe filter expressions.
+ * doc/gpg.texi: Remove some superfluous .E.
+ (FILTER EXPRESSIONS): New.
+
+ yat2m: Fix table formatting.
+ * doc/yat2m.c (proc_texi_cmd): Use .TQ for @itemx. Print a .P at the
+ end of a level 0 table.
+
+2016-07-01 Werner Koch <wk at gnupg.org>
+
+ gpg: New option --export-filter.
+ * g10/gpg.c (oExportFilter): New.
+ (opts): Add --export-filter.
+ (main): Handle option.
+ * g10/export.c: Include recsel.h, init.h, and mbox-util.h.
+ (export_keep_uid): New global var.
+ (cleanup_export_globals): New.
+ (parse_and_set_export_filter): New.
+ (filter_getval): New.
+ (apply_keep_uid_filter): New.
+ (do_export_stream): Apply filter if set.
+
+ gpg: New option --import-filter.
+ * g10/gpg.c (oImportFilter): New.
+ (opts): Add --import-filter.
+ (main): Handle option.
+ * g10/import.c: Include recsel.h, init.h, and mbox-util.h.
+ (import_keep_uid): New global var.
+ (cleanup_import_globals): New.
+ (parse_and_set_import_filter): New.
+ (filter_getval): New.
+ (apply_keep_uid_filter): New.
+ (import_one): Apply filter if set.
+
+ gpg: Allow to cache the mbox in a user id struct.
+ * g10/packet.h (PKT_user_id): Add field 'mbox'.
+ * g10/free-packet.c (free_user_id): Free that.
+
+ gpg: Make sure a user ID packet has always a terminating Nul in memory.
+ * g10/keygen.c (write_uid): Avoid overflow.
+
+ common: Add function to select records etc.
+ * common/recsel.c, common/recsel.h: New.
+ * common/t-recsel.c: New.
+
+ common: Smart up register_mem_cleanup_func.
+ * common/init.c (register_mem_cleanup_func): Avoid double registration.
+
+2016-07-01 Justus Winter <justus at g10code.com>
+
+ common: Annotate semi-static allocation.
+ * common/argparse.c (optfile_parse): Allow string arguments to leak.
+
+ g10: Fix memory leak.
+ * g10/keyserver.c (parse_keyserver_uri): Free URI.
+
+ tools/gpgtar: Annotate semi-static allocation.
+ * tools/gpgtar.c (shell_parse_argv): Annotate argument vector as
+ leaked.
+
+ g10: Fix memory leak.
+ * g10/import.c (transfer_secret_keys): Release curve from the previous
+ iteration.
+
+ g10: Fix build with disabled kbnode cache.
+ * g10/kbnode.c (release_unused_nodes): Fix build with disabled kbnode
+ cache.
+
+ g10: Fix memory leak.
+ * g10/trustdb.c (tdb_get_validity_core): Fix kbnode leak.
+
+ g10: Fix memory leak.
+ * g10/keygen.c (keygen_set_std_prefs): Fix memory leak.
+
+ Fix trivial memory leaks in tests.
+ * dirmngr/t-ldap-parse-uri.c (check_ldap_escape_filter): Free result.
+ * g10/t-stutter.c (main): Free file name.
+
+2016-06-30 Justus Winter <justus at g10code.com>
+
+ tools: Fix trivial memory leak.
+ * tools/gpg-connect-agent.c (main): Fix trivial memory leak.
+
+ g10: Fix memory leak.
+ * g10/export.c (do_export_stream): Free secret parameters.
+
+ g10: Fix memory leak.
+ * g10/keygen.c (read_parameter_file): Free 'line'.
+
+ g10: Fix memory leak.
+ * g10/sign.c (mk_notation_policy_etc): Free 'mbox'.
+
+ common: Fix memory leak.
+ * g10/textfilter.c (copy_clearsig_text): Free buffer.
+
+ common: Fix memory leak.
+ * common/iobuf.c (iobuf_set_partial_body_length_mode): Only create
+ context if necessary.
+
+ common: Fix memory leak.
+ * common/simple-pwquery.c (agent_open): Free socket path.
+
+ g10: Fix keybox-related memory leaks.
+ * g10/keydb.c (keydb_release): Clear keyblock cache.
+ (keydb_get_keyblock): Revert previous change.
+ * kbx/keybox-blob.c (create_blob_finish): Free previous buffer, free
+ fixups after applying them.
+ (_keybox_release_blob): Free buffer. Currently, the buffer has been
+ extracted before the keybox is released, but this is the right thing
+ to do here.
+
+ Fixes-commit: c57501cc
+
+ g10: Fix memory leak.
+ * g10/compress.c (release_context): Free buffers.
+
+ g10: Fix memory leak.
+ * g10/sign.c (write_plaintext_packet): Free packet.
+
+ g10: Fix memory leak.
+ * g10/mainproc.c (release_list): Do not exit early if list is NULL,
+ there are other resources that must be released.
+
+ gpgscm: Fix reallocating string ports.
+ * tests/gpgscm/scheme.c (realloc_port_string): Use memcpy because
+ Scheme strings may contain 0s.
+
+ gpgscm: Free memory backing string ports.
+ * tests/gpgscm/scheme.c (finalize_cell): Free memory backing string
+ ports.
+
+ gpgscm: Use the allocator from libgcrypt.
+ * tests/gpgscm/main.c (main): Use the allocator from libgcrypt.
+
+ w32: Fix build.
+ * g10/keyedit.c (keyedit_quick_revuid): Fix call to
+ 'check_trustdb_stale'.
+
+ Fixes-commit: 55d112ee
+
+2016-06-30 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ g10: Implement gpg --quick-revuid.
+ * g10/revoke.c (get_default_uid_revocation_reason): New.
+ * g10/keyedit.c (menu_revuid): Break out creation of uid revocation
+ into new function core_revuid.
+ * g10/keyedit.c (keyedit_quick_revuid): New. Selects key and
+ uid, invokes core_revuid.
+ * g10/gpg.c (main): Handle --quick-revuid argument.
+ * doc/gpg.texi: Document --quick-revuid.
+
+2016-06-29 Werner Koch <wk at gnupg.org>
+
+ tools: Add gpg-wks-client and gpg-wks-server.
+ * configure.ac: Add option --enable-wks-tools
+ * tools/gpg-wks-client.c: New.
+ * tools/gpg-wks-server.c: New.
+ * tools/gpg-wks.h: new.
+ * tools/wks-receive.c: New.
+ * tools/call-dirmngr.c, tools/call-dirmngr.h: New.
+
+ build: Improve GNUPG_BUILD_PROGRAM macro.
+ * acinclude.m4 (GNUPG_BUILD_PROGRAM): Allow for dash in options.
+
+ tools: Add modules for MIME parsing and creating.
+ * tools/mime-maker.c: New.
+ * tools/mime-maker.h: New.
+ * tools/mime-parser.c: New.
+ * tools/mime-parser.h: New.
+
+2016-06-28 Justus Winter <justus at g10code.com>
+
+ gpgscm: Fix memory leaks.
+ * tests/gpgscm/ffi-private.h (ffi_schemify_name): Fix prototype.
+ (ffi_define_function_name): Free schemified name.
+ (ffi_define_function): Likewise.
+ (ffi_define_constant): Likewise.
+ (ffi_define_variable_pointer): Likewise.
+ * tests/gpgscm/ffi.c (do_wait_processes): Free arrays.
+ (ffi_schemify_name): Fix type.
+ * tests/gpgscm/main.c (main): Free 'sc'.
+
+ gpgscm: Free file names.
+ * tests/gpgscm/scheme.c (scheme_load_named_file): Free file name.
+
+ gpgscm: Fix buffer overflow.
+ * tests/gpgscm/scheme.c (store_string): Avoid writing past allocated
+ buffer.
+
+ g10: Fix memory leaks.
+ * g10/keydb.c (keydb_get_keyblock): Free 'sigstatus' and 'iobuf'.
+ * g10/t-keydb-get-keyblock.c: Fix trivial memory leaks.
+ * g10/t-keydb.c: Likewise.
+
+ common: Fix memory leaks.
+ * common/ccparray.c (ccparray_put): Free old array.
+ * common/stringhelp.c (do_make_filename): Free 'home'.
+ * common/t-convert.c: Fix trivial memory leaks.
+ * common/t-iobuf.c: Likewise.
+ * common/t-mbox-util.c: Likewise.
+ * common/t-name-value.c: Likewise.
+ * common/t-stringhelp.c: Likewise.
+ * common/t-strlist.c: Likewise.
+
+2016-06-28 Werner Koch <wk at gnupg.org>
+
+ dirmngr: add option to retrieve extra WKS info.
+ * dirmngr/server.c (cmd_wkd_get): Add option --submission-address.
+
+ gpg: Add hack to --quick-gen-key to create Curve25519 keys.
+ * g10/keygen.c (quick_generate_keypair): Add special algo string
+ "test-default".
+
+ common: New function rfctimestamp.
+ * common/gettime.c (rfctimestamp): New.
+
+ common: Add missing header file for clarity.
+ * common/zb32.c: Include zb32.h.
+
+2016-06-28 Justus Winter <justus at g10code.com>
+
+ tools/gpgtar: Fix handling of '-'.
+ * tools/gpgtar-extract.c (gpgtar_extract): Use stdin if file is '-'.
+ * tools/gpgtar-list.c (gpgtar_list): Likewise.
+
+ common: Close input stream.
+ * common/exechelp-posix.c (gnupg_spawn_process): Also close the input
+ stream in the child.
+
+ common: Fix copying data from the spawned child.
+ Fixes intermittent gpgtar failures.
+
+ * common/exectool.c (copy_buffer_do_copy): Initialize 'nwritten'.
+ (gnupg_exec_tool_stream): Loop until all data is copied.
+
+2016-06-28 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Fix --list-packets.
+ * g10/gpg.c (main): Call set_packet_list_mode after assignment of
+ opt.list_packets.
+ * g10/mainproc.c (do_proc_packets): Don't stop processing with
+ --list-packets as the comment says.
+ * g10/options.h (list_packets): Fix the comment.
+ * g10/parse-packet.c: Fix the condition for opt.list_packets.
+
+2016-06-25 Werner Koch <wk at gnupg.org>
+
+ build: Add aclocal macro from pkg-config.
+ * m4/pkg.m4: New.
+
+ yat2m: Silence lint warnings and fix a printf format bug.
+ * doc/yat2m.c (ATTR_PRINTF, ATTR_NR_PRINTF, ATTR_MALLOC): New.
+ (die, err, inf, xmalloc, xcalloc): New prototypes with attributes.
+ (get_section_buffer): Take care of !N_SECTIONS.
+ (proc_texi_cmd): Cast precision format arg.
+ (proc_texi_buffer): Do not set IN_CMD when not used afterwards.
+
+2016-06-24 Werner Koch <wk at gnupg.org>
+
+ gpg: New import option "import-export".
+ * g10/import.c (parse_import_options): Add option "import-export".
+ (write_keyblock_to_output): New.
+ (import_one): Implement option.
+
+2016-06-23 Werner Koch <wk at gnupg.org>
+
+ gpg: New import option "import-show".
+ * g10/options.h (IMPORT_SHOW): New.
+ * g10/import.c (parse_import_options): Add "import-show".
+ (import_one): Implement that.
+
+ gpg: Do not print the validity after key generation.
+ * g10/keylist.c (struct keylist_context): Add field NO_VALIDITY.
+ (list_keyblock_print): Take care of it.
+ (list_keyblock_direct): Add arg NO_VALIDITY.
+ * g10/keygen.c (do_generate_keypair): Merge keyblock and print w/o
+ validity.
+
+ common: Fix possible small memory leak in b64dec.c.
+ * common/b64dec.c (b64dec_finish): Always release TITLE.
+
+2016-06-23 Justus Winter <justus at g10code.com>
+
+ tests/openpgp: Fake the system time for the tofu test.
+ The keys in the tofu test are set to expire on 2016-09-17. Fake the
+ system time for this test.
+
+ This commit includes changes to the old test as well, for those who
+ need to backport it.
+
+ * tests/openpgp/gpg-agent.conf.tmpl: Drop trailing newlines.
+ * tests/openpgp/tofu.scm: Fake system time.
+ * tests/openpgp/tofu.test: Likewise.
+
+ GnuPG-bug-id: 2393
+
+ gpgscm: Handle exceptions in the transformation monad.
+ * tests/gpgscm/tests.scm (pipe:do): Raise errors.
+ (tr:spawn): Catch and return errors.
+ (tr:call-with-content): Likewise.
+ (tr:{open,write-to,pipe-do,assert-identity,assert-weak-identity}):
+ Adapt.
+
+ tests/openpgp: Improve tests.
+ * tests/openpgp/multisig.scm: Simplify test.
+ * tests/openpgp/setup.scm (dearmor): Use pipe.
+
+ gpgscm: Add types for special objects.
+ * tests/gpgscm/scheme.c (enum scheme_types): Add types for boolean,
+ nil, eof, and the sink object.
+ (type_to_string): Handle new types.
+ (scheme_init_custom_alloc): Give special objects a type.
+
+ gpgscm: Fix Scheme initialization.
+ This potentially causes a crash if the garbage collector marks an eof
+ object.
+
+ * tests/gpgscm/scheme.c (scheme_init_custom_alloc): Initialize
+ 'EOF_OBJ'.
+
+2016-06-23 Werner Koch <wk at gnupg.org>
+
+ common: Add dedicated private key functions to name-value.c.
+ * common/name-value.c (struct name_value_container): Add field
+ 'private_key_mode'.
+ (my_error): New. Use instead of gpg_error.
+ (nvc_new_private_key): New.
+ (nve_release): Add arg 'private_key_mode'.
+ (nvc_release): Call nve_release with private_key_mode flag.
+ (nvc_delete): Ditto.
+ (_nvc_add): Do no special case "Key:" in non-private_key_mode.
+ (nvc_get_private_key): Return error in non-private_key_mode.
+ (nvc_set_private_key): Ditto.
+ (nvc_parse): Factor all code out to ...
+ (do_nvc_parse): new. Add arg 'for_private_key'.
+ (nvc_parse_private_key): New.
+ * agent/findkey.c (write_extended_private_key): Replace nvc_parse by
+ nvc_parse_private_key.
+ (read_key_file): Ditto.
+
+ * common/t-name-value.c (private_key_mode): New variable.
+ (my_nvc_new): New. Replace all callers.
+ (test_key_extraction): Take mode in account.
+ (run_tests): Ditto.
+ (run_modification_tests): Ditto.
+ (parse): Ditto.
+ (main): Add option --parse and rename --parse to --parse-key.
+
+ common: Rename external symbols in name-value.c.
+ * common/name-value.c, common/name-value.h: Rename symbol prefixes
+ from "pkc_" to "nvc_" and from "pke_" to "nve_". Change all callers.
+
+ common: Rename private-keys.c to name-value.c.
+ * common/private-keys.c: Rename to name-value.c.
+ * common/private-keys.h: Rename to name-value.h. Chage all users.
+ * common/t-private-keys.c: Rename to t-name-value.c.
+ * common/Makefile.am: Adjust accordingly.
+
+ common: Add PGP armor decoding to b64dec.
+ * common/b64dec.c (decoder_states): Add new states.
+ (b64dec_proc): Handle PGP armored format.
+
+2016-06-23 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Fix regression of card-edit/fetch.
+ * g10/card-util.c (fetch_url): Call keyserver_fetch instead of
+ keyserver_import_fprint.
+
+2016-06-21 Justus Winter <justus at g10code.com>
+
+ tests/migrations: Convert to Scheme and re-enable.
+ * configure.ac: Re-enable.
+ * tests/Makefile.am: Likewise.
+ * tests/migrations/Makefile.am (TESTS): Use Scheme tests.
+ * tests/migrations/common.scm: New file.
+ * tests/migrations/extended-private-key-format.scm: Likewise.
+ * tests/migrations/from-classic.scm: Likewise.
+ * tests/migrations/extended-private-key-format.test: Drop file.
+ * tests/migrations/from-classic.test: Drop file.
+
+ gpgscm: Add more file handling functions.
+ * tests/gpgscm/ffi.c (do_glob): New function.
+ (ffi_init): Define new function.
+ * tests/gpgscm/tests.scm (basename-suffix): New function.x
+
+ tests/openpgp: Port the remaining tests to Scheme.
+ * tests/openpgp/Makefile.am (TESTS): Add new tests.
+ * tests/openpgp/defs.scm (gpg-with-colons): New function.
+ (get-config): Use new function.
+ * tests/openpgp/export.scm: New file.
+ * tests/openpgp/tofu.scm: Likewise.
+
+ gpgscm: Improve test framework.
+ * tests/gpgscm/lib.scm (echo): Move...
+ * tests/gpgscm/tests.scm (echo): ... here.
+ (info, error, skip): And use echo here.
+ (file-exists?): New function.
+ (tr:spawn): Check that source exists and if the sink has been created.
+ (tr:call-with-content): Hand in optional arguments.
+
+ gpgscm: Use native string searching functions.
+ * tests/gpgscm/ffi-private.h: Handle character arguments.
+ * tests/gpgscm/ffi.c (do_string_index): New function.
+ (do_string_rindex): Likewise.
+ (do_string_contains): Likewise.
+ (ffi_init): Define new functions.
+ * tests/gpgscm/ffi.scm (ffi-define): New macro.
+ * tests/gpgscm/lib.scm (string-index): Use native function,
+ demonstrate behavior.
+ (string-rindex): Likewise.
+ (string-contains?): Likewise.
+ Demonstrate behavior of various other functions.
+ (read-all): Rework so that it can handle large files.
+
+ gpgscm: Improve error reporting.
+ * tests/gpgscm/scheme.c (type_to_string): New function.
+ (Eval_Cycle): Include actual type in error message.
+
+ gpgscm: Make memory allocation failures fatal.
+ * tests/gpgscm/scheme.c (Eval_Cycle): Exit if we run out of memory.
+
+2016-06-21 Werner Koch <wk at gnupg.org>
+
+ sm: Do not install cacert and other root certificates.
+ * doc/Makefile.am (dist_pkgdata_DATA): Move qualified.txt and
+ com-certs.pem to ...
+ (EXTRA_DIST): here.
+
+2016-06-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Add experimental support for an issuer fpr.
+ * common/openpgpdefs.h (SIGSUBPKT_ISSUER_FPR): New.
+ * g10/build-packet.c (build_sig_subpkt_from_sig): Add arg PKSK and
+ insert the issuer fpr if needed.
+ * g10/sign.c (write_signature_packets): Pass signing key.
+ (make_keysig_packet): Ditto.
+ (update_keysig_packet): Ditto.
+ * g10/parse-packet.c (dump_sig_subpkt): Print issuer fpr.
+ (parse_one_sig_subpkt): Detect issuer fpr.
+ (can_handle_critical): Add issuer fpr.
+ * g10/mainproc.c (check_sig_and_print): Try to get key via fingerprint.
+ * g10/gpgv.c (keyserver_import_fprint): New stub.
+ * g10/test-stubs.c (keyserver_import_fprint): New stub.
+
+ gpg: New option --rfc4880bis.
+ * g10/options.h (struct opt): Add field flags.rfc4880bis.
+ * g10/gpg.c (oRFC4880bis): new.
+ (opts): add --rfc4880bis.
+ (main): Implement that and print a warning.
+
+2016-06-19 Niibe Yutaka <gniibe at fsij.org>
+
+ scd: Reset nonnull_nad to zero for VENDOR_GEMPC.
+ * (parse_ccid_descriptor): nonnull_nad = 0 for all GEMPC device.
+
+2016-06-17 Werner Koch <wk at gnupg.org>
+
+ tests: Make make distcheck work again.
+ * Makefile.am (tests): Remove test code which would led to doubling
+ calls to for e.g. "make distclean".
+ * tests/Makefile.am: Typo fixes.
+ * tests/gpgscm/Makefile.am (EXTRA_DIST): Fix name of License file.
+ Add repl.scm.
+ (check): Replace by check-local because check is a standard automake
+ target.
+ * tests/openpgp/Makefile.am (TESTS_ENVIRONMENT): Replace gmake0sim by
+ automake generated macro.
+ (EXTRA_DIST): Add defs.scm
+
+ gpgscm: Silence compiler warnings.
+ * tests/gpgscm/scheme.c (mk_integer): Rename arg NUM to N.
+ (fill_vector): Ditto.
+ (mark): Rename var NUM to N.
+ (set_slot_in_env): Mark SC as unused.
+ (is_any): Mark P as unused.
+
+ Add license notices for TinySCHEME.
+ * tests/gpgscm/COPYING: Rename to ...
+ * tests/gpgscm/LICENSE.TinySCHEME: this.
+ * AUTHORS: Add a note about TinySCHEME.
+ * build-aux/speedo/w32/pkg-copyright.txt: Add TinySCHEME notice.
+
+2016-06-17 Justus Winter <justus at g10code.com>
+
+ tests/openpgp: Reimplement tests in Scheme.
+ * Makefile.am: Build the test infrastructure on Windows.
+ * tests/openpgp/Makefile.am (required_pgms): Add gpgscm.
+ (TESTS_ENVIRONMENT): Make sure gpgscm and the libraries are found.
+ (TESTS): Replace tests with the new Scheme implementations.
+ * tests/openpgp/4gb-packet.scm: New file.
+ * tests/openpgp/README: Likewise.
+ * tests/openpgp/armdetach.scm: Likewise.
+ * tests/openpgp/armdetachm.scm: Likewise.
+ * tests/openpgp/armencrypt.scm: Likewise.
+ * tests/openpgp/armencryptp.scm: Likewise.
+ * tests/openpgp/armor.scm: Likewise.
+ * tests/openpgp/armsignencrypt.scm: Likewise.
+ * tests/openpgp/armsigs.scm: Likewise.
+ * tests/openpgp/clearsig.scm: Likewise.
+ * tests/openpgp/conventional-mdc.scm: Likewise.
+ * tests/openpgp/conventional.scm: Likewise.
+ * tests/openpgp/decrypt-dsa.scm: Likewise.
+ * tests/openpgp/decrypt.scm: Likewise.
+ * tests/openpgp/default-key.scm: Likewise.
+ * tests/openpgp/defs.scm: Likewise.
+ * tests/openpgp/detach.scm: Likewise.
+ * tests/openpgp/detachm.scm: Likewise.
+ * tests/openpgp/ecc.scm: Likewise.
+ * tests/openpgp/encrypt-dsa.scm: Likewise.
+ * tests/openpgp/encrypt.scm: Likewise.
+ * tests/openpgp/encryptp.scm: Likewise.
+ * tests/openpgp/finish.scm: Likewise.
+ * tests/openpgp/genkey1024.scm: Likewise.
+ * tests/openpgp/gpgtar.scm: Likewise.
+ * tests/openpgp/import.scm: Likewise.
+ * tests/openpgp/mds.scm: Likewise.
+ * tests/openpgp/multisig.scm: Likewise.
+ * tests/openpgp/run-tests.scm: Likewise.
+ * tests/openpgp/seat.scm: Likewise.
+ * tests/openpgp/setup.scm: Likewise.
+ * tests/openpgp/signencrypt-dsa.scm: Likewise.
+ * tests/openpgp/signencrypt.scm: Likewise.
+ * tests/openpgp/sigs-dsa.scm: Likewise.
+ * tests/openpgp/sigs.scm: Likewise.
+ * tests/openpgp/use-exact-key.scm: Likewise.
+ * tests/openpgp/verify.scm: Likewise.
+ * tests/openpgp/version.scm: Likewise.
+
+ tests/gpgscm: Add a TinySCHEME-based test driver.
+ * configure.ac: Add new component.
+ * tests/Makefile.am: Likewise.
+ * tests/gpgscm/Makefile.am: New file.
+ * tests/gpgscm/ffi-private.h: Likewise.
+ * tests/gpgscm/ffi.c: Likewise.
+ * tests/gpgscm/ffi.h: Likewise.
+ * tests/gpgscm/ffi.scm: Likewise.
+ * tests/gpgscm/lib.scm: Likewise.
+ * tests/gpgscm/main.c: Likewise.
+ * tests/gpgscm/private.h: Likewise.
+ * tests/gpgscm/repl.scm: Likewise.
+ * tests/gpgscm/scheme-config.h: Likewise.
+ * tests/gpgscm/t-child.c: Likewise.
+ * tests/gpgscm/t-child.scm: Likewise.
+ * tests/gpgscm/tests.scm: Likewise.
+
+ tests/gpgscm: Foreign objects support for TinySCHEME.
+ * tests/gpgscm/scheme-private.h (struct cell): Add 'foreign_object'.
+ (is_foreign_object): New prototype.
+ (get_foreign_object_{vtable,data}): Likewise.
+ * tests/gpgscm/scheme.c (enum scheme_types): New type.
+ (is_foreign_object): New function.
+ (get_foreign_object_{vtable,data}): Likewise.
+ (mk_foreign_object): Likewise.
+ (finalize_cell): Free foreign objects.
+ (atom2str): Pretty-print foreign objects.
+ (vtbl): Add new functions.
+ * tests/gpgscm/scheme.h (struct foreign_object_vtable): New type.
+ (mk_foreign_object): New prototype.
+ (struct scheme_interface): Add new functions.
+
+ Patch from Thomas Munro,
+ https://sourceforge.net/p/tinyscheme/patches/13/
+
+ tests/gpgscm: Dynamically allocate string buffer.
+ * tests/gpgscm/scheme-config.h (strbuff{,_size}): Make buffer dynamic.
+ * tests/gpgscm/scheme.c (expand_strbuff): New function.
+ (putcharacter): Adapt length test.
+ (readstrexp): Expand buffer if necessary.
+ (scheme_init_custom_alloc): Initialize buffer.
+ (scheme_deinit): Free buffer.
+
+ Patch from Thomas Munro,
+ https://sourceforge.net/p/tinyscheme/patches/11/
+
+ tests/gpgscm: Make exception value available.
+ * tests/gpgscm/init.scm (throw): Hand exception value to the handler.
+ (catch): And bind it to *error*.
+
+ tests/gpgscm: Add package macro.
+ * tests/gpgscm/init.scm: Add package macro from manual.
+
+ tests/gpgscm: Expose function to open streams as Scheme ports.
+ * tests/gpgscm/scheme.c (vtbl): Add 'port_from_file' to the vtable.
+ * tests/gpgscm/scheme.h (struct scheme_interface): New field
+ 'mk_port_from_file'.
+
+ tests/gpgscm: Nicer error message.
+ * tests/gpgscm/scheme.c (opexe_0): Include the value that we tried to
+ evaluate as function-like in the error message.
+
+ tests/gpgscm: Fix error hook.
+ * tests/gpgscm/init.scm (*error-hook*): Fix error hook so that the
+ whole error message is displayed.
+
+ tests/gpgscm: Handle unhandled enumeration values.
+ * tests/gpgscm/scheme.c (opexe_{3,4}): Handle unhandled enumeration
+ values in the opcode dispatching code.
+
+ tests/gpgscm: Verbatim import of latest TinySCHEME.
+ Revision 110 from svn://svn.code.sf.net/p/tinyscheme/code/trunk
+
+ * tests/gpgscm/COPYING: New file.
+ * tests/gpgscm/Manual.txt: Likewise.
+ * tests/gpgscm/init.scm: Likewise.
+ * tests/gpgscm/opdefines.h: Likewise.
+ * tests/gpgscm/scheme-private.h: Likewise.
+ * tests/gpgscm/scheme.c: Likewise.
+ * tests/gpgscm/scheme.h: Likewise.
+
+2016-06-17 Werner Koch <wk at gnupg.org>
+
+ scd: Make option --homedir work.
+ * scd/scdaemon.c (opts): Add --homedir.
+
+2016-06-16 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.13.
+
+2016-06-16 Yuri Chornoivan <yurchor at ukr.net>
+
+ po: Update Ukrainian translation.
+
+2016-06-16 Ineiev <ineiev at gnu.org>
+
+ po: Update Russian translation.
+
+2016-06-16 Werner Koch <wk at gnupg.org>
+
+ po: Update German translation.
+
+ Add missing files so that make distcheck works again,
+ * tests/openpgp/Makefile.am (CLEANFILES): Add created file
+ "passphrases".
+ * tools/Makefile.am (EXTRA_DIST): Add no-libgcrypt.c.
+
+ tools: Fix typo in function name of symcryptrun.
+ * tools/symcryptrun.c (main): Fix typo.
+
+2016-06-15 Niibe Yutaka <gniibe at fsij.org>
+
+ g10: Fix another race condition for trustdb access.
+ * g10/tdbio.c (create_version_record): Call create_hashtable to always
+ make hashtable, together with the version record.
+ (get_trusthashrec): Remove call to create_hashtable.
+
+2016-06-14 Werner Koch <wk at gnupg.org>
+
+ gpg: Print the subkey's curve and not the primary key curve.
+ * g10/keylist.c (list_keyblock_colon): Use PK2 for the subkey's curve.
+
+ ldap: Improve info output for v3 fallback.
+ * dirmngr/dirmngr_ldap.c (fetch_ldap): Do not use log_debug in an
+ unprotected section. Replace log_debug by log_info in verbose mode.
+
+2016-06-14 Andre Heinecke <aheinecke at intevation.de>
+
+ dirmngr: Try ldap protocol V3 as fallback.
+ * dirmngr/dirmngr_ldap.c (fetch_ldap): Try V3 Protocol in case
+ default Protocol gives error.
+
+ dirmngr: Print ldap error if bind fails.
+ * dirmngr/dirmngr_ldap.c (fetch_ldap): Use ldap_err2string on bind
+ return.
+
+2016-06-14 Werner Koch <wk at gnupg.org>
+
+ gpgsm: Allow ciphers AES192 and SERPENT256.
+ * sm/gpgsm.c (main): Add AES192 cipher. Allow SERPENT256.
+
+ doc: Add files and envvars to a new index.
+ * doc/gnupg.texi: Define new index "ef".
+ (Environment Index): New.
+
+ gpg: Avoid endless loop in a tofu error case.
+ * g10/tofu.c (get_trust): Do not jump to out.
+
+ gpg: Split tofu's get_trust function into several smaller ones.
+ * g10/tofu.c (get_trust): Factor code out to ...
+ (format_conflict_msg_part1): new and to ...
+ (ask_about_binding): new.
+
+2016-06-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Un-deprecate option --auto-key-retrieve.
+ * g10/gpg.c (main): Remove deprecation warning.
+
+ gpg: New option --disable-signer-uid, create Signer's UID sub-packet.
+ * g10/gpg.c (oDisableSignerUID): New.
+ (opts): New option '--disable-signer-uid'.
+ (main): Set option.
+ * g10/options.h (opt): Add field flags.disable_signer_uid.
+ * g10/sign.c: Include mbox-util.h.
+ (mk_notation_policy_etc): Embed the signer's uid.
+ * g10/mainproc.c (check_sig_and_print): Do not use WKD for auto key
+ retrieval if --disable-signer-uid is used.
+
+ gpg: Try Signer's User ID sub-packet with --auto-key-retrieve.
+ * g10/packet.h (PKT_signature): Add field 'signers_uid'.
+ * g10/parse-packet.c (parse_signature): Set this field.
+ * g10/free-packet.c (free_seckey_enc): Free field.
+ (copy_signature): Copy field.
+ * g10/mainproc.c (akl_has_wkd_method): New.
+ (check_sig_and_print): Extend NEWSIG status. If WKD is enabled try to
+ locate a missing key via the signature's Signer's User ID sub-packet.
+ Do this right before trying a keyserver lookup.
+
+2016-06-11 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove C-99ism, re-indent, and simplify one function.
+ * g10/call-agent.c (struct keyinfo_data): Rename to
+ keyinfo_data_parm_s.
+ (agent_get_keyinfo): Replace C-99 style init.
+ (keyinfo_status_cb): Use new fucntion split_fields.
+ * g10/export.c (match_curve_skey_pk): Add missings returns error
+ cases.
+ (cleartext_secret_key_to_openpgp): Better clear PK->PKEY first.
+
+ common: New function split_fields.
+ * common/stringhelp.c (split_fields): New.
+ * common/t-stringhelp.c: Include assert.h.
+ (test_split_fields): New.
+ (main): Call test.
+
+2016-06-11 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ g10: Export cleartext keys as cleartext.
+ * g10/export.c (do_export_stream): If a key is stored by the agent in
+ cleartext, then try to export it as cleartext.
+ * tests/openpgp/export.test: For secret keys that are stored in
+ cleartext, test should try to export without pinentry interaction.
+
+ g10: Allow receiving cleartext secret keys from agent.
+ * g10/export.c (match_curve_skey_pk): New function, testing whether an
+ OpenPGP public key and an S-expression use the same curve.
+ * g10/export.c (cleartext_secret_key_to_openpgp): New function,
+ filling in the secret key parameters of a PKT_public_key object from
+ a corresponding cleartext S-expression.
+ * g10/export.c, g10/main.h (receive_seckey_from_agent): Add cleartext
+ parameter, enabling retrieval of the secret key, unlocked.
+ * g10/export.c (do_export_stream): Send cleartext as 0, keeping current
+ behavior.
+ * g10/keygen.c (card_store_key_with_backup): Use cleartext=0 to ensure
+ that smartcard backups are all passphrase-locked.
+
+ g10: Add openpgp_protected flag to agent secret key export functions.
+ * g10/call-agent.c, g10/call-agent.h (agent_export_key): Add
+ openpgp_protected flag.
+ * g10/export.c (receive_seckey_from_agent): Request openpgp_protected
+ secret keys from agent.
+ * agent/command.c (hlp_export_key): EXPORT_KEY help text: add a
+ brief description of the effect of --openpgp.
+
+ g10: report whether key in agent is passphrase-protected or not.
+ * g10/call-agent.c, g10/call-agent.h (agent_get_keyinfo): add
+ r_cleartext parameter to report whether a key is stored without
+ passphrase protection.
+ * g10/gpgv.c, g10/test-stubs.c: augment dummy agent_get_keyinfo to
+ match new API.
+ * g10/export.c, g10/keyedit.c, g10/keygen.c, g10/keylist.c,
+ g10/sign.c: pass NULL to agent_get_keyinfo since we do not yet
+ need to know whether agent is passphrase-protected.
+
+2016-06-08 Werner Koch <wk at gnupg.org>
+
+ Explicitly restrict socket permissions.
+ * agent/gpg-agent.c (create_server_socket): Call chmod before listen.
+ * scd/scdaemon.c (create_server_socket): Ditto.
+ * dirmngr/dirmngr.c (main): Ditto.
+
+ w32: Fix recent build regression.
+ * common/homedir.c (_gnupg_socketdir_internal) [W32]: Add definition
+ for NAME.
+ * g10/gpg.c (main) [W32]: Fix use og gnupg_homedir.
+
+ * agent/gpg-agent.c (remove_socket): Remove unused var P.
+ * scd/scdaemon.c (cleanup): Ditto.
+
+ gpgconf: New commands --create-socketdir and --remove-socketdir.
+ * tools/gpgconf.c: Include unistd.h.
+ (aCreateSocketDir, aRemoveSocketDir): New.
+ (opts): Add --create-socketdir and --remove-socketdir.
+ (main): Implement them.
+
+ Implement /run/user/UID/gnupg based sockets.
+ * common/homedir.c: Include sys/stat.h and zb32.h.
+ (w32_portable_app, w32_bin_is_bin): Change type from int to byte.
+ (non_default_homedir): New.
+ (is_gnupg_default_homedir): New.
+ (default_homedir): Set non_default_homedir.
+ (gnupg_set_homedir): Set non_default_homedir and make
+ the_gnupg_homedir and absolute directory name.
+ (gnupg_homedir): Return an absolute directory name.
+ (_gnupg_socketdir_internal): New.
+ (gnupg_socketdir): Implement /run/user/ based sockets.
+ * tools/gpg-connect-agent.c (get_var_ext): Replace now obsolete
+ make_filename by xstrdup.
+ * tools/gpgconf.c (main): Sue gnupg_homedir for the "homedir:" output.
+
+ gpgconf: Add option --homedir.
+ * tools/gpgconf.c (opts): Add --homedir.
+ (main): Set homedir.
+
+ Do not use no-libgcrypt dummy for tools.
+ * tools/Makefile.am (gpgconf_SOURCES): Remove no-libgcrypt.c.
+ (gpgconf_LDADD): Add LIBGCRYPT_LIBS.
+ (gpg_connect_agent_LDADD): Ditto.
+ (gpgtar_LDADD): Ditto.
+ * dirmngr/Makefile.am (dirmngr_client_LDADD): Ditto.
+ (t_common_ldadd): Ditto. Remove no-libgcrypt.o.
+
+ Do not try to remove the enclosing directory of sockets.
+ * agent/gpg-agent.c (remove_socket): Do not remove the enclosing
+ directory.
+ * scd/scdaemon.c (cleanup): Ditto.
+
+2016-06-07 Werner Koch <wk at gnupg.org>
+
+ common: New function gnupg_socketdir.
+ * common/homedir.c (gnupg_socketdir): New.
+ * agent/gpg-agent.c (create_socket_name): Use new function instead of
+ gnupg_homedir.
+ (check_own_socket): Ditto.
+ (check_for_running_agent): Ditto.
+ * agent/preset-passphrase.c (main): Ditto.
+ * common/asshelp.c (start_new_gpg_agent): Ditto.
+ * scd/scdaemon.c (create_socket_name): Ditto.
+ * tools/gpgconf.c (main): Ditto.
+ * tools/symcryptrun.c (main): Ditto.
+
+ common: Remove homedir arg from start_new_{dirmngr,gpg_agent}.
+ * common/asshelp.c (start_new_gpg_agent): Remove arg 'homedir' in
+ favor of gnupg_homedir (). Change all callers.
+ (start_new_dirmngr): Ditto.
+ * common/get-passphrase.c (gnupg_prepare_get_passphrase): Remove arg
+ 'homedir'.
+
+ Replace use of opt.homedir by accessor functions.
+ * common/homedir.c (the_gnupg_homedir): New var.
+ (gnupg_set_homedir): New.
+ (gnupg_homedir): New.
+ * g10/options.h (struct opt): Remove 'homedir' and replace all users
+ by the new accessor functions.
+ * g13/g13-common.h (struct opt): Ditto.
+ * scd/scdaemon.h (struct opt): Ditto.
+ * sm/gpgsm.h (struct opt): Ditto.
+ * dirmngr/dirmngr.h (struct opt): Ditto.
+ * agent/preset-passphrase.c (opt_homedir): Ditto.
+ * agent/protect-tool.c (opt_homedir): Ditto.
+
+2016-06-07 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+ gpg: Fix command line parsing of --quick-addkey and --quick-gen-key.
+ * g10/gpg.c (main): Compose a block by curly braces.
+
+2016-06-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Use --keyid-format=none by default.
+ * g10/gpg.c (main): Init keyid_format to KF_NONE.
+ * g10/keyid.c (format_keyid): Ditto.
+ (keystrlen): Ditto.
+
+ gpg: Add option --with-subkey-fingerprint.
+ * g10/gpg.c (oWithSubkeyFingerprint): New.
+ (opts): Add --with-subkey-fingerprint[s].
+ (main): Set that option.
+ * g10/options.h (struct opt): Add 'with_subkey_fingerprint'.
+ * g10/keylist.c (list_keyblock_print): Print subkey fingerprint.
+ (print_fingerprint): Tweak printing to use compact format if
+ desirable.
+
+ gpg: Implement --keyid-format=none.
+ * g10/gpg.c (main): Add option "none" to --keyid-format.
+ * g10/options.h (KF_NONE): New.
+ * g10/keyid.c (format_keyid): Implement that.
+ (keystr): Use format "long" is KF_NONE is in use.
+ (keystr_with_sub): Ditto.
+ * g10/keylist.c (list_keyblock_print): Adjust indentaion for KF_NONE.
+ Factor some code out to ...
+ (print_key_line): new.
+ (print_fingerprint): Add mode 20.
+ * g10/mainproc.c (list_node): Use print_key_line. Replace MAINKEY by
+ flags.primary in the PK. Fix putting a " revoked..." string into the
+ colons format.
+ * g10/pkclist.c (do_edit_ownertrust): Use print_key_line. This
+ slightly changes the putput format.
+ * g10/revoke.c (gen_standard_revoke): Use print_key_line. This may
+ also put "expires: " into the output.
+
+2016-06-04 Werner Koch <wk at gnupg.org>
+
+ w32: Require --enable-build-timestamp for the BUILD_HOSTNAME.
+ * configure.ac (BUILD_HOSTNAME): Set to "<anon>" bey default.
+ * build-aux/speedo.mk (speedo_pkg_gnupg_configure): Add
+ --enable-build-timestamp.
+
+2016-06-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Add the fingerprint to KEY_CREATED for subkeys.
+ * g10/keygen.c (print_status_key_created): Make more robust by
+ allowing a NULL for PK.
+ (generate_subkeypair): Use print_status_key_created.
+ (generate_card_subkeypair): Ditto.
+
+ gpg: Try to use the passphrase from the primary for --quick-addkey.
+ * agent/command.c (cmd_genkey): Add option --passwd-nonce.
+ (cmd_passwd): Return a PASSWD_NONCE in verify mode.
+ * g10/call-agent.c (agent_genkey): Add arg 'passwd_nonce_addr' and do
+ not send a RESET if given.
+ (agent_passwd): Add arg 'verify'.
+ * g10/keygen.c (common_gen): Add optional arg 'passwd_nonce_addr'.
+ (gen_elg, gen_dsa, gen_ecc, gen_rsa, do_create): Ditto.
+ (generate_subkeypair): Use sepeare hexgrip var for the to be created
+ for hexgrip feature. Verify primary key first. Make use of the
+ passwd nonce. Allow for a static passphrase.
+
+ gpg: Extend the --quick-gen-key command.
+ * g10/keygen.c (quickgen_set_para): Add arg 'use'.
+ (quick_generate_keypair): Add args 'algostr', 'usagestr', and
+ 'expirestr'. Implement primary only key mode.
+ (parse_algo_usage_expire): Set NBITS for the default algo.
+ * g10/gpg.c (main): Extend --quick-gen-key command.
+
+ gpg: Improve the new parse_subkey_algostr_usagestr fucntion.
+ * g10/keygen.c (parse_usagestr): Allow "cert".
+ (generate_subkeypair): Factor expire parsing out to ...
+ (parse_subkey_algostr_usagestr): here. Rename to ...
+ (parse_algo_usage_expire): this. Add arg 'for_subkey'. Set CERT for
+ primary key and check that it is not set for subkeys.
+
+ gpg: New command --quick-addkey.
+ * g10/keygen.c (DEFAULT_STD_SUBKEYUSE): New.
+ (ask_keysize): Factor code out to ...
+ (get_keysize_range, fixup_keysize): new.
+ (parse_parameter_usage): Factor parsing out to ...
+ (parse_usagestr): new. Allow use of "encr" as alias for "encrypt".
+ (parse_subkey_algostr_usagestr): New.
+ (generate_subkeypair): Add new args. Implement unattended mode.
+
+ * g10/keyedit.c (keyedit_quick_sign): Factor some code out to ...
+ (find_by_primary_fpr): new.
+ (keyedit_quick_addkey): New.
+ * g10/gpg.c (aQuickAddKey): New.
+ (opts): Add --quick-addkey.
+ (main): Implement.
+
+ gpg: Do not abort on certain invalid packets.
+ * g10/build-packet.c (write_fake_data): Check for non-opaque data.
+ * g10/seskey.c (do_encode_md): Return NULL instead of abort.
+
+ common: New function openpgp_is_curve_supported.
+ * common/openpgp-oid.c: Include openpgpdefs.h.
+ (oidtable): Add field pubkey_algo.
+ (openpgp_is_curve_supported): New.
+
+2016-06-01 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Allow User ID length >= 256.
+ * build-packet.c (do_user_id): Call write_header2 with HDRLEN not set.
+
+2016-05-31 Werner Koch <wk at gnupg.org>
+
+ gpg: New status code NOTATION_FLAGS.
+ * common/status.h (STATUS_NOTATION_FLAGS: New.
+ * g10/packet.h (struct notation): Add flags.human.
+ (notation_t): New typedef.
+ * g10/build-packet.c (sig_to_notation): Set flags.human.
+ * g10/keylist.c (show_notation): Write STATUS_NOTATION_FLAGS.
+
+2016-05-28 Werner Koch <wk at gnupg.org>
+
+ common: Add a status callback to gnupg_exec_tool_stream.
+ * common/exectool.h (exec_tool_status_cb_t): New.
+ * common/exectool.c: Include missing exectool.h.
+ (read_and_log_buffer_t): Replace array by pointer.
+ (gnupg_exec_tool_stream): Add args 'status_cb' and 'status_cb_value'.
+ Change all callers to pass NULL for them. Malloc buffer for
+ FDERRSTATE.
+ (read_and_log_stderr): Implement status_fd feature.
+
+2016-05-27 Werner Koch <wk at gnupg.org>
+
+ common: Allow a second input stream for gnupg_exec_tool_stream.
+ * common/exechelp-posix.c (do_exec): Add arg 'except' and pass to
+ close_all_fds.
+ (gnupg_spawn_process): Add arg 'except'. Change callers to pass NULL
+ for it.
+ * common/exechelp-w32.c (gnupg_spawn_process): Add dummy arg 'except'.
+ * common/exechelp-w32ce.c (gnupg_spawn_process): Ditto.
+ * common/exectool.c (copy_buffer_do_copy): Allow NULL for SINK.
+ (gnupg_exec_tool_stream): Add arg 'inextra'. Change callers to pass
+ NULL for it. Allow NULL for OUTPUT.
+
+ common: Simplify the fd closing patch 512c56a.
+ * common/exechelp-posix.c (get_max_fds): Use /proc/self.
+
+ common: Speedup closing fds before an exec.
+ * common/exechelp-posix.c [__linux__]: Include dirent.h.
+ (get_max_fds) [__linux__]: Return the actual used highest fd.
+
+ tools: Improve debug output of rfc822parse.
+ * tools/rfc822parse.c (show_event): Add missing events.
+
+ build: Remove obsolete tests for funopen and fopencookie.
+ * configure.ac (AC_CHECK_FUNCS): Remove tests for funopen.
+
+ common: Extend gnupg_create_inbound_pipe et al.
+ * common/exechelp-posix.c (gnupg_create_inbound_pipe): Add args 'r_fp'
+ and 'nonblock'.
+ (gnupg_create_outbound_pipe): Ditto.
+ * common/exechelp-w32.c (gnupg_create_inbound_pipe): Add non yet
+ functional args 'r_fp' and 'nonblock'.
+ (gnupg_create_outbound_pipe): Ditto.
+ * common/exechelp-w32ce.c (gnupg_create_inbound_pipe): Ditto.
+ (gnupg_create_outbound_pipe): Ditto.
+
+ common: Make use of default_errsource in exechelp.
+ * common/exechelp-posix.c (my_error_from_syserror, my_error): New.
+ Use them instead of gpg_error and gpg_error_from_syserror.
+ (create_pipe_and_estream): Remove arg ERRSOURCE and fix use of
+ OUTBOUND which has a wrong name. Adjust callers.
+ (gnupg_spawn_process): Remove arg ERRSOURCE and replace by use of
+ DEFAULT_ERRSOURCE.
+ * common/exechelp-w32.c (gnupg_spawn_process): Ditto.
+ * common/exechelp-w32ce.c (gnupg_spawn_process): Ditto.
+ * common/exectool.c (gnupg_exec_tool_stream): Do not pass
+ GPG_ERROR_FROM_SYSERROR.
+ * tools/gpgconf-comp.c (gc_component_check_options): Ditto.
+ (retrieve_options_from_program): Ditto.
+
+ gpg: Keep current and total of PROGESS status lines small enough.
+ * g10/progress.c (progress_filter): Factor status wrote out to...
+ (write_status_progress): New. Scale values down.
+
+2016-05-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ configure: Detection of libusb on FreeBSD.
+ * configure.ac (LIBUSB_LIBS): Use LIBUSB_NAME for AC_CHECK_LIB.
+
+2016-05-25 Werner Koch <wk at gnupg.org>
+
+ build: Switch to new URL for swdb.lst.
+
+2016-05-24 Werner Koch <wk at gnupg.org>
+
+ gpgtar: Simplify code by using ccparray.
+ * tools/gpgtar-create.c (gpgtar_create): Use ccparray functions.
+ * tools/gpgtar-extract.c (gpgtar_extract): Ditto.
+ * tools/gpgtar-list.c (gpgtar_list): Ditto.
+
+ common: Add simple dynamic array function.
+ * common/ccparray.c: New.
+ * common/ccparray.h: New.
+ * common/t-ccparray.c: New.
+ * common/Makefile.am (common_sources): Add files.
+ (module_tests): Add test file.
+ (t_ccparray_LDADD): New.
+
+2016-05-23 Justus Winter <justus at g10code.com>
+
+ tests: Test the pinentry interactions when exporting keys.
+ * tests/openpgp/export.test: Test pinentry interactions.
+
+ tests: Add support for a passphrase queue to fake pinentry.
+ * tests/openpgp/fake-pinentry.c (get_passphrase): New function.
+ (main): Add option --passphrasefile and read passphrases from it.
+
+ tests: Add logging to fake pinentry.
+ * tests/openpgp/fake-pinentry.c (log_stream): New variable.
+ (reply): New function.
+ (spacep,skip_options,option_value): Copy from common.
+ (main): Parse arguments, add --logfile option, write logfile.
+
+ tests: Add export test.
+ * tests/openpgp/Makefile.am (TESTS): Add new file.
+ * tests/openpgp/export.test: New file.
+
+2016-05-21 Werner Koch <wk at gnupg.org>
+
+ gpg: Speed up key listing in Tofu mode.
+ * g10/tofu.c (get_trust): Add arg PK. Uses this instead of a an extra
+ lookup of the public key by fingerrpint.
+ (tofu_register): Pass PK to get_trust.
+ (tofu_get_validity): Ditto.
+
+ *g10/tofu.c (tofu_register): Remove unused FINGERPRINT_PP.
+
+ gpg: Avoid name spaces clash with future sqlite versions.
+ * g10/sqlite.c: Rename to gpgsql.c. Change function prefixes to
+ gpgsql_.
+ * g10/sqlite.h: Rename to gpgsql.h.
+ * g10/tofu.c: Adjust for changes.
+
+ gpg: Explicitly close a combined Tofu DB.
+ * g10/tofu.c (tofu_closedbs): Close combined DB.
+
+ gpg: Store the Tofu meta handle for databases in CTRL.
+ * g10/gpg.h (struct tofu_dbs_s, tofu_dbs_t): New declarations.
+ (struct server_control_s): Add field tofu.dbs.
+ * g10/tofu.c (struct dbs): Rename to tofu_dbs_s. Replace all users by
+ by tofu_dbs_t.
+ (opendbs): Add arg CTRL. Cache the DBS in CTRL.
+ (closedbs): Rename to tofu_closedbs and make global. Add arg CTRL.
+ (tofu_register): Add arg CTRL. Change all callers. Do not call
+ closedbs.
+ (tofu_get_validity): Ditto.
+ (tofu_set_policy): Ditto.
+ (tofu_get_policy): Ditto.
+ (tofu_set_policy_by_keyid): Add arg CTRL.
+ * g10/gpg.c (gpg_deinit_default_ctrl): Call tofu_closedbs.
+
+ gpg: Pass CTRL object down to the trust functions.
+
+ gpg: Fix the TOFU_STATS_LONG status.
+ * g10/tofu.c (show_statistics): Print TOFU STATS with formatting
+ characters.
+
+2016-05-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Print "[ never ]" instead of err for validity.
+ * g10/trust.c (uid_trust_string_fixed): Handle NEVER.
+
+2016-05-18 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Adjust the WKD lookup to specs version -01.
+ * dirmngr/server.c (cmd_wkd_get): Remove second occurrence of the
+ domain part.
+
+2016-05-17 Werner Koch <wk at gnupg.org>
+
+ gpg: Emit new status line KEY_CONSIDERED.
+ * common/status.h (STATUS_KEY_CONSIDERED): New.
+ * g10/getkey.c: Include status.h.
+ (LOOKUP_NOT_SELECTED, LOOKUP_ALL_SUBKEYS_EXPIRED): New.
+ (finish_lookup): Add arg R_FLAGS. Count expired and revoked keys and
+ set flag. Check a requested usage before checking for expiraion or
+ revocation.
+ (print_status_key_considered): New.
+ (lookup): Print new status.
+
+2016-05-11 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Fix signature checking.
+ * g10/sig-check.c (check_signature_over_key_or_uid): Fix call to
+ walk_kbnode.
+
+2016-05-10 Werner Koch <wk at gnupg.org>
+
+ gpg: Allow unattended deletion of secret keys.
+ * agent/command.c (cmd_delete_key): Make the --force option depend on
+ --disallow-loopback-passphrase.
+ * g10/call-agent.c (agent_delete_key): Add arg FORCE.
+ * g10/delkey.c (do_delete_key): Pass opt.answer_yes to
+ agent_delete_key.
+
+2016-05-09 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix buglet in the check_all_keysigs function.
+ * g10/keyedit.c (sig_comparison): Actually compare the pubkey
+ algorithms.
+
+ gpg: Request a "save" after cmd "check" fixed something.
+ * g10/keyedit.c (keyedit_menu) <cmdCHECK>: Set modified.
+
+2016-05-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+2016-05-04 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.12.
+
+ speedo,w32: Remove the installation directory page.
+ * build-aux/speedo/w32/inst.nsi (MUI_PAGE_DIRECTORY): Remove.
+
+ gpg: Fix const char pointer mismatch with gettext.
+ * g10/tofu.c (get_trust): Use const char *.
+
+ speedo: Build sqlite with static-libgcc.
+ * build-aux/speedo/patches/sqlite.patch: New.
+ * Makefile.am (EXTRA_DIST): Add file.
+
+ speedo: Also try patch files w/o version number.
+ * build-aux/speedo.mk (SPKG_template): Try such a patch file.
+
+2016-05-04 Andre Heinecke <aheinecke at intevation.de>
+
+ speedo,w32: Install sqlite.
+ * build-aux/speedo/w32/inst.nsi (-sqlite, -un.sqlite): New.
+
+ speedo,w32: Fix uninstallation.
+ * build-aux/speedo/w32/inst.nsi (-un.gnupg): Delete distsigkey and
+ dirmngr-conf.skel
+
+ speedo,w32: Install localisation.
+ * build-aux/speedo/w32/inst.nsi (-libgpg-error, GnuPG): Install l10n.
+ (-un.libgpg-error, -un.gnupg): Uninstall l10n files.
+
+2016-05-04 Werner Koch <wk at gnupg.org>
+
+ tests: Disable the migrations tests.
+ * tests/Makefile.am (SUBDIRS): Remove migrations.
+ * configure.ac (AC_CONFIG_FILES): Remove migrations Makefile.
+
+2016-05-04 Ineiev <ineiev at gnu.org>
+
+ po: Update Russian translation.
+
+2016-05-04 Werner Koch <wk at gnupg.org>
+
+ po: Update German translation.
+
+ Some minor string changes and fixed a printf format.
+ * g10/build-packet.c (notation_value_to_human_readable_string): Use
+ %zu for size_t.
+
+ build: Update config.{guess,sub} to 2016-04-02 and 2016-03-30.
+ * build-aux/config.guess: Update.
+ * build-aux/config.sub: Update.
+
+ agent: Make --allow-loopback-pinentry the default.
+ * agent/gpg-agent.c (oNoAllowLoopbackPinentry): New.
+ (opts): Add --no-allow-loopback-pinentry. Hide
+ description of --allow-loopback-pinentry.
+ (parse_rereadable_options): Set opt.allow_loopback_pinentry by
+ default.
+ (main): Replace allow-loopback-pinentry by no-allow-loopback-pinentry
+ in the gpgconf list.
+ * tools/gpgconf-comp.c (gc_options_gpg_agent): Ditto.
+
+2016-05-03 Werner Koch <wk at gnupg.org>
+
+ common: Print https URLs in help messages.
+ * common/argparse.c (strusage): Print https URLS.
+
+ tests: Silence output of some tests.
+ * common/t-exechelp.c (print_open_fds): Silence non-verbose output.
+ (test_close_all_fds): Ditto.
+ * common/t-session-env.c (show_stdnames): Indent output.
+ * g10/test.c (TEST): Silence non-verbose okay output.
+ (exit_tests): Ditto.
+ * tools/gpg-zip.in (tar_verbose_opt): Add option --quiet.
+ * tests/openpgp/gpgtar.test (GPGZIP): Pass option --quiet.
+ * tests/openpgp/mds.test: Indent MD5 notice.
+ * tests/openpgp/version.test: Indent --version output.
+
+ gpg: Emit status lines TOFU_STATS and TOFU_STATS_LONG.
+ * g10/tofu.c (NO_WARNING_THRESHOLD): Rename to BASIC_TRUST_THRESHOLD.
+ (FULL_TRUST_THRESHOLD): New.
+ (write_stats_status): New.
+ (show_statistics): Call new function. Print TOFU_STATS_LONG.
+
+2016-05-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Extend TRUST_foo status lines with the trust model.
+ * g10/trustdb.h (TRUST_FLAG_TOFU_BASED): New.
+ * g10/trustdb.c (trust_model_string): Lowercase the strings. Add arg
+ "model" and change callers to call with OPT.TRUST_MODEL.
+ * g10/tofu.c (tofu_wot_trust_combine): Set TRUST_FLAG_TOFU_BASED.
+ * g10/pkclist.c (write_trust_status): New.
+ (check_signatures_trust): Call new function.
+
+ gpg: Improve line wrapping for a tofu message.
+ * g10/tofu.c (time_ago_str): Mark non-breakable spaces.
+ (show_statistics): Remove marks.
+
+ gpg: Re-format some tofu messages.
+ * common/status.h (STATUS_TOFU_USER, STATUS_TOFU_STATS)
+ (STATUS_TOFU_STATS_SHORT, STATUS_TOFU_STATS_LONG): New.
+ * g10/tofu.c (NO_WARNING_THRESHOLD): New.
+ (record_binding, tofu_register): Take care of --dry-run.
+ (show_statistics): Print STATUS_TOFU_USER. Reformat some messages.
+ Fix the ngettext/strcmp thing. Use log_string instead of log_info.
+ Use NO_WARNING_THRESHOLD constant.
+ (get_trust): Use format_text and print a compact fingerprint.
+
+2016-05-02 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: More fix of error return path.
+ * scd/command.c (open_card): Return GPG_ERR_ENODEV on the failure of
+ apdu_connect.
+
+2016-04-29 Werner Koch <wk at gnupg.org>
+
+ common: Extend log_string to indent lines.
+ * common/logging.c (do_logv): Add indentation when called via
+ log_string.
+
+ gpg: Factor some code code out of tofu.c.
+ * g10/tofu.c (string_to_long): New.
+ (string_to_ulong): New.
+ (get_single_unsigned_long_cb): Replace strtol/strtoul by new function.
+ (get_single_long_cb): Ditto.
+ (signature_stats_collect_cb): Ditto.
+ (get_policy): Ditto.
+ (show_statistics): Ditto. Uese es_free instead of free.
+
+ gpg: Remove all assert.h and s/assert/log_assert/.
+
+ common: Improve log_assert.
+ * common/logging.c (bug_at): Do not i18n the string.
+ (_log_assert): New.
+ * common/logging.h (log_assert): Use new function and pass line
+ information.
+
+2016-04-28 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix error return path.
+ * scd/ccid-driver.c (bulk_in): Remove EAGAIN handling.
+ Handle LIBUSB_ERROR_NO_DEVICE to return CCID_DRIVER_ERR_NO_READER.
+
+2016-04-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix memory leaks.
+ * scd/ccid-driver.c (scan_or_find_usb_device): Return on
+ LIBUSB_ERROR_NO_MEM. Free CONFIG before return except on error.
+ (scan_or_find_devices): Free device list.
+
+2016-04-27 Werner Koch <wk at gnupg.org>
+
+ gpg: Add experimental AKL method "wkd" and option --with-wkd-hash.
+ * g10/getkey.c (parse_auto_key_locate): Add method "wkd".
+ (get_pubkey_byname): Implement that method. Also rename a variable.
+ * g10/call-dirmngr.c (gpg_dirmngr_wkd_get): New.
+ * g10/keyserver.c (keyserver_import_wkd): New.
+ * g10/test-stubs.c (keyserver_import_wkd): Add stub.
+ * g10/gpgv.c (keyserver_import_wkd): Ditto.
+ * g10/options.h (opt): Add field 'with_wkd_hash'.
+ (AKL_WKD): New.
+
+ * g10/gpg.c (oWithWKDHash): New.
+ (opts): Add option --with-wkd-hash.
+ (main): Set that option.
+ * g10/keylist.c (list_keyblock_print): Implement that option.
+
+ dirmngr: Add experimental command WKD_GET.
+ * dirmngr/server.c (cmd_wkd_get): New.
+ (register_commands): Add command WKD_GET.
+
+ dirmngr: Use system provided root CAs with KS_FETCH.
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Use HTTP_FLAG_TRUST_SYS.
+
+2016-04-26 Werner Koch <wk at gnupg.org>
+
+ http: Allow to request system defined CAs for TLS.
+ * dirmngr/http.h (HTTP_FLAG_TRUST_DEF, HTTP_FLAG_TRUST_SYS): New.
+ * dirmngr/http.c (http_session_new): Add arg "flags".
+ * dirmngr/ks-engine-hkp.c (send_request): Use new flag
+ HTTP_FLAG_TRUST_DEF for the new arg of http_session_new.
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
+ * dirmngr/t-http.c (main): Ditto.
+
+2016-04-25 Werner Koch <wk at gnupg.org>
+
+ common: Minor fixes for the new private-keys.c.
+ * common/private-keys.c (my_error_from_syserror): New. Use it in
+ place of gpg_error_from_syserror.
+ (_pkc_add, pkc_lookup, pke_next_value): Use ascii_strcasecmp.
+ (pkc_parse): Use xtrystrdup and append_to_strlist_try as intended.
+
+ (_pkc_add): Add braces around if-statement.
+
+ common: Use new function to print a failure of xtrymalloc.
+ * common/miscellaneous.c (xoutofcore): New.
+ * common/strlist.c (append_to_strlist): Use instead of abort.
+ (append_to_strlist_try): Use xtrymalloc instead of xmalloc.
+
+2016-04-21 Justus Winter <justus at g10code.com>
+
+ common: Add support for the new extended private key format.
+ * agent/findkey.c (write_extended_private_key): New function.
+ (agent_write_private_key): Detect if an existing file is in extended
+ format and update the key within if it is.
+ (read_key_file): Handle the new format.
+ * agent/keyformat.txt: Document the new format.
+ * common/Makefile.am: Add the new files.
+ * common/private-keys.c: New file.
+ * common/private-keys.h: Likewise.
+ * common/t-private-keys.c: Likewise.
+ * common/util.h (alphap, alnump): New macros.
+ * tests/migrations: Add test demonstrating that we can cope with the
+ new format.
+
+ common: Add 'free_strlist_wipe' which wipes memory.
+ * common/strlist.c (free_strlist_wipe): New function.
+ * common/strlist.h (free_strlist_wipe): New prototype.
+
+ common: Add 'append_to_strlist_try' which can fail.
+ * common/strlist.c (append_to_strlist): Use the new function.
+ (append_to_strlist_try): New function.
+ * common/strlist.h (append_to_strlist_try): New prototype.
+
+ agent: Convert key format document to org.
+ * agent/keyformat.txt: Convert to org mode.
+
+ tests: Make migration test more robust and silent.
+ * tests/migrations/from-classic.test: Fix in-tree build, silence test.
+
+ Fixes-commit: defbc70b
+
+2016-04-21 Werner Koch <wk at gnupg.org>
+
+ w32: Use --enable-gpg2-is-gpg by default.
+ * autogen.rc: Add option also for plain Windows.
+
+ w32: Replace libiconv DLL by iconv feature of libgpg-error.
+ * configure.ac: Do nor require libiconv for W32.
+ * common/utf8conv.c [W32]: Do not incluce iconv.h. Request
+ libgpg-error iconv macros.
+ (jnlib_iconv): Use ICONV_CONST macro.
+ * build-aux/speedo/w32/inst.nsi [!WITH_GUI]: Do not install libiconv.
+ * build-aux/speedo.mk (speedo_spkgs) [!WITH_GUI]: Likewise.
+
+2016-04-20 Justus Winter <justus at g10code.com>
+
+ agent: Sanitize permissions of the private key directory.
+ * agent/gpg-agent.c (create_private_keys_directory): Set permissions.
+ * common/sysutils.c (modestr_to_mode): New function.
+ (gnupg_mkdir): Use new function.
+ (gnupg_chmod): New function.
+ * common/sysutils.h (gnupg_chmod): New prototype.
+ * tests/migrations/from-classic.test: Test migration with existing
+ directory.
+
+ GnuPG-bug-id: 2312
+
+ tests: Test the migration from a classic GnuPG home directory.
+ * configure.ac: Add new directory.
+ * tests/Makefile.am (SUBDIRS): Likewise.
+ * tests/migrations/Makefile.am: New file.
+ * tests/migrations/from-classic.gpghome/pubring.gpg.asc: Likewise.
+ * tests/migrations/from-classic.gpghome/secring.gpg.asc: Likewise.
+ * tests/migrations/from-classic.gpghome/trustdb.gpg.asc: Likewise.
+ * tests/migrations/from-classic.test: Likewise.
+
+2016-04-20 Werner Koch <wk at gnupg.org>
+
+ speedo: Use swdb.lst to define the SQLite version.
+ * build-aux/speedo.mk: Change sqlite to use our mirror and the
+ swdb.lst file.
+ * build-aux/speedo/w32/inst.nsi: gpg is now build and installed as
+ gpg.
+
+2016-04-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve UID selction of --quick-sign-key.
+ * g10/keyedit.c (keyedit_quick_sign): Improve UID selection and print
+ error for non-found userids.
+
+ gpg: Avoid debug like output at start of --edit-key.
+ * g10/keyedit.c (check_all_keysigs): Print info only after something
+ has been modified.
+
+2016-04-15 Andre Heinecke <aheinecke at intevation.de>
+
+ dirmngr: Fix https never reported in general help.
+ * dirmngr/ks-engine-http.c (ks_hkp_help): Also print https
+ when supported and no uri provided.
+
+ dirmngr: Fix https incorrectly reported in help.
+ * dirmngr/ks-engine-http.c (ks_hkp_help): Only print https if tls
+ is supported.
+
+2016-04-14 Werner Koch <wk at gnupg.org>
+
+ agent: Fix regression due to recent commit 4159567.
+ * agent/protect.c (do_encryption): Fix CBC hashing.
+
+ agent: Allow gpg-protect-tool to handle openpgp-native protection.
+ * agent/protect-tool.c (read_and_unprotect): Add arg ctrl and pass to
+ agent_unprotect.
+ (main): Allocate a simple CTRL object and pass it to
+ read_and_unprotect.
+ (convert_from_openpgp_native): Remove stub.
+ (agent_key_available, agent_get_cache): New stubs.
+ (agent_askpin): New emulation for the one in call-pinentry.c.
+ (agent_write_private_key): New to dump key.
+ * agent/Makefile.am (gpg_protect_tool_SOURCES): Add cvt-openpgp.c
+
+ tests: Set fake-pinentry's stdout and stdin to _IOLBF.
+ * tests/openpgp/fake-pinentry.c (main): Call setvbuf. Show passphrase
+ at startup. Increase buffer.
+
+2016-04-12 Werner Koch <wk at gnupg.org>
+
+ agent: Implement new protection mode openpgp-s2k3-ocb-aes.
+ * agent/protect.c (agent_protect): Add arg use_ocb. Change all caller
+ to pass -1 for default.
+ * agent/protect-tool.c: New option --debug-use-ocb.
+ (oDebugUseOCB): New.
+ (opt_debug_use_ocb): New.
+ (main): Set option.
+ (read_and_protect): Implement option.
+
+ * agent/protect.c (OCB_MODE_SUPPORTED): New macro.
+ (PROT_DEFAULT_TO_OCB): New macro.
+ (do_encryption): Add args use_ocb, hashbegin, hashlen, timestamp_exp,
+ and timestamp_exp_len. Implement OCB.
+ (agent_protect): Change to support OCB.
+ (do_decryption): Add new args is_ocb, aadhole_begin, and aadhole_len.
+ Implement OCB.
+ (merge_lists): Allow NULL for sha1hash.
+ (agent_unprotect): Change to support OCB.
+ (agent_private_key_type): Remove debug output.
+
+ indent: Help Emacs not to get confused by conditional compilation.
+ * agent/protect.c (calibrate_get_time) [W32]: Use separate function
+ calls for W32 and W32CE.
+
+2016-04-07 Justus Winter <justus at g10code.com>
+
+ g10: Fix exporting secret keys of certain sizes.
+ * g10/build-packet.c (do_key): Do not use the header length specified
+ by the public key packet from the keyring, but let 'write_header2'
+ compute the required length.
+
+2016-04-06 Justus Winter <justus at g10code.com>
+
+ Revert "g10: Support armored keyrings in gpgv."
+ This reverts commit abb352de51bc964c06007fce43ed6f6caea87c15.
+
+2016-04-05 Justus Winter <justus at g10code.com>
+
+ dirmngr: Autodetect PEM format in dirmngr-client.
+ * dirmngr/dirmngr-client.c (init_asctobin): New function.
+ (main): Move the initialization code to the new function.
+ (read_pem_certificate): Initialize base64 table.
+ (read_certificate): Try to decode certificates given in files as PEM
+ first.
+
+ GnuPG-bug-id: 1844
+
+2016-04-05 Werner Koch <wk at gnupg.org>
+
+ build: Fix for: Build gpgcompose only in maintainer mode.
+ * g10/Makefile.am (noinst_PROGRAMS): Always add module_tests.
+
+ doc: Install gpg and gpgv man pages under the correct name.
+ * doc/mkdefsinc.c (main): Add double include guard. Set variable
+ gpgtwohack. Define macros gpgname and gpgvname.
+ * doc/gpg.texi: Remove macro definition for gpgname. Use Texinfo var
+ gpgtwohack to prepare the man pages. Use @gpgname everywhere.
+ * doc/gpgv.texi: Likewise.
+ * doc/Makefile.am (myman_pages): Remove gpg2.1 and gpgv2.1 but add
+ them depending on USE_GPG2_HACK.
+
+ build: Build gpgcompose only in maintainer mode.
+ * g10/Makefile.am (noinst_PROGRAMS): Add gpgcompose only in maintainer
+ mode.
+
+ gpg: Replace use of "gpg2" by GPG_NAME.
+
+2016-04-04 Werner Koch <wk at gnupg.org>
+
+ Now build "gpg" binary but install as "gpg2"
+ * configure.ac (USE_GPG2_HACK): New ac_define am_conditional.
+ * common/homedir.c (gnupg_module_name): Replace use of macro
+ NAME_OF_INSTALLED_GPG.
+ * g10/keygen.c (generate_keypair): Ditto.
+ * g10/Makefile.am (bin_PROGRAMS): Remove.
+ (noinst_PROGRAMS): Add gpg or gpg2 and gpgv or gpg2.
+ (gpg2_hack_list): New.
+ (use_gpg2_hack): New.
+ (gpg2_SOURCES): Rename to gpg_SOURCES.
+ (gpgv2_SOURCES): Rename to gpgv_SOURCES.
+ (gpg2_LDADD): Rename to gpg_LDADD.
+ (gpgv2_LDADD): Rename to gpgv_LDADD.
+ (gpg2_LDFLAGS): Rename to gpg_LDFLAGS.
+ (gpgv2_LDFLAGS): Rename to gpgv2_LDFLAGS.
+ (install-exec-hook): Remove WinCE specific rules and add new rules.
+ (uninstall-local): Uninstall gpg/gpg2 and gpgv/gpgv2.
+ * tests/openpgp/Makefile.am (required_pgms): s/gpg2/gpg/.
+ * tests/openpgp/defs.inc: Ditto.
+ * tests/openpgp/gpgtar.test: Ditto.
+ * tests/openpgp/mkdemodirs: Ditto.
+ * tests/openpgp/signdemokey: Ditto.
+
+ * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Remove obsolete
+ --enable-mailto, add --enable-gpg2-is-gpg.
+
+ tests: Add missing file.
+ * tests/openpgp/Makefile.am (TEST_FILES): Add plain-largeo.asc.
+
+2016-04-04 Justus Winter <justus at g10code.com>
+
+ g10: Support armored keyrings in gpgv.
+ * doc/gpgv.texi: Document the feature.
+ * g10/Makefile.am (gpgv2_SOURCES): Add dearmor.c.
+ * g10/dearmor.c (dearmor_file): Add sink argument.
+ * g10/gpg.c (main): Adapt accordingly.
+ * g10/gpgv.c (make_temp_dir): New function.
+ (main): De-armor keyrings.
+ * g10/main.h (dearmor_file): Adapt prototype.
+
+ GnuPG-bug-id: 2290
+
+ tests: Fix default key test.
+ * tests/openpgp/default-key.test: Avoid using the option
+ '--trust-model' unconditionally.
+
+2016-04-01 Justus Winter <justus at g10code.com>
+
+ build: Check for conflicting trust model options.
+ * configure.ac: Disable TOFU if configured without trust models, and
+ check for conflicting options.
+
+ g10: Remove option --always-trust if compiled without trust models.
+ * g10/gpg.c (opts): Remove option --always-trust if compiled without
+ trust models.
+
+2016-03-31 Justus Winter <justus at g10code.com>
+
+ speedo,w32: Build libsqlite3.
+ * build-aux/speedo.mk (speedo_spkgs): Add libsqlite3 on w32.
+ (libsqlite3_ver): New variable.
+ (speedo_pkg_libsqlite3_tar): Likewise.
+
+ g10: Use gpg-error abstraction of sched_yield.
+ * g10/tofu.c (begin_transaction): Use 'gpgrt_yield'.
+
+2016-03-29 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix NULL-segv for missing tofu DB.
+ * g10/tofu.c (opendb): Guard call to timeout function.
+
+2016-03-22 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve message when asking for key capabilities.
+ * g10/keygen.c (ask_key_flags): Improve message.
+
+ gpg: Remove the extra prompt for Curve25519.
+ * g10/keygen.c (MY_USE_ECDSADH): New macro local to ask_curve.
+ (ask_curve): Use a fixed table of curve names and reserve a slot for
+ Curve448. Simplify CurveNNNN/EdNNNN switching.
+ (ask_curve): Remove the Curve25519 is non-standard prompt.
+
+2016-03-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Silence trustdb computation with --quiet.
+ * g10/trustdb.c (validate_keys): Do not print log_info stuff in quiet
+ mode.
+
+2016-03-17 Werner Koch <wk at gnupg.org>
+
+ sm: Always create a keybox header when creating a new keybox.
+ * sm/keydb.c (maybe_create_keybox): Create the header blob.
+
+2016-03-17 Neal H. Walfield <neal at g10code.com>
+
+ doc: Improve documentation of --enable-large-rsa.
+ * doc/gpg.texi (--enable-large-rsa): Improve text.
+
+2016-03-17 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: allow removal of the shadowed key.
+ * agent/findkey.c (agent_delete_key): Remove the key when asked.
+
+2016-03-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Add const qualifier.
+ * g10/gpgcompose.c (show_help): Those are strings not to be modified.
+
+2016-03-15 Werner Koch <wk at gnupg.org>
+
+ gpg: Do not rely on a certain evaluation order.
+ * g10/keyedit.c (print_and_check_one_sig): Call check_key_signature
+ before derefing IS_SELFSIG.
+
+2016-03-14 Werner Koch <wk at gnupg.org>
+
+ scd: Add manufacturer id 0x000a.
+ * g10/card-util.c (get_manufacturer): Add it.
+
+2016-03-10 Kevin J. McCarthy <kevin at 8t8.us>
+
+ g10: Silence message if --quiet is given.
+ * g10/getkey.c (parse_def_secret_key): Silence message if --quiet is
+ given.
+
+2016-03-08 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Add a new test.
+ * g10/Makefile.am (EXTRA_DIST): Add t-stutter-data.asc.
+ (module_tests): Add t-stutter.
+ (t_stutter_SOURCES): New variable.
+ (t_stutter_LDADD): New variable.
+
+2016-03-07 Justus Winter <justus at g10code.com>
+
+ sm: Implement pinentry loopback and reading passphrases from fd.
+ * doc/gpgsm.texi: Document '--pinentry-mode' and '--passphrase-fd'.
+ * sm/Makefile.am (gpgsm_SOURCES): Add new files
+ * sm/call-agent.c (struct default_inq_parm_s): New definition.
+ (start_agent): Pass in the pinentry mode.
+ (default_inq_cb): Handle 'PASSPHRASE' and 'NEW_PASSPHRASE' inquiries.
+ Adapt all call sites to the new callback cookie.
+ * sm/gpgsm.c (cmd_and_opt_values): Add new values.
+ (opts): Add new options.
+ (main): Handle new options.
+ * sm/gpgsm.h (struct opt): Add field 'pinentry_mode'.
+ * sm/passphrase.c: New file.
+ * sm/passphrase.h: Likewise.
+
+ GnuPG-bug-id: 1970
+
+ sm: Remove unused argument '--fixed-passphrase'.
+ * doc/gpgsm.texi: Drop description.
+ * sm/gpgsm.c (cmd_and_opt_values): Drop enum value.
+ (opts): Drop argument.
+ (main): Drop argument handling.
+ * sm/gpgsm.h (struct opt): Drop field 'fixed_passphrase'.
+
+ kbx: Avoid undefined behavior.
+ * kbx/keybox-file.c (_keybox_read_blob2): Cast to unsigned int before
+ shifting.
+
+2016-03-07 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Bug fix for a device with multiple interfaces.
+ * scd/ccid-driver.c (scan_or_find_usb_device): Use IFC_NO when
+ accessing interface information.
+
+2016-03-04 Justus Winter <justus at g10code.com>
+
+ build: Make libusb a hard requirement if the ccid driver is requested.
+ * configure.ac: Print an error message and die if the internal ccid
+ driver is requested but no suitable libusb is found.
+
+ g10: Drop superfluous declaration.
+ * g10/main.h (disable_core_dumps): Drop declaration.
+
+ g10: Guard code against errors.
+ * g10/keygen.c (do_generate_keypair): Check for errors, in which case
+ 'pri_psk' is NULL.
+
+ Fixes-commit: bf9d1248
+
+2016-03-03 Justus Winter <justus at g10code.com>
+
+ dirmngr: Add more missing CFLAGS.
+ * dirmngr/Makefile.am (t_ldap_parse_uri_CFLAGS): Add
+ 'GCRYPT_CFLAGS'.
+ (t_dns_stuff_CFLAGS): Likewise.
+
+ GnuPG-bug-id: 2235
+
+ tests/openpgp: Skip gpgtar test if it has not been built.
+ * tests/openpgp/gpgtar.test: Check if executable exists.
+
+ GnuPG-bug-id: 2261
+
+2016-03-02 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Add new program gpgcompose.
+ * g10/packet.h: Include "util.h".
+ * g10/encrypt.c (encrypt_seskey): Don't mark as static.
+ * g10/gpgcompose.c: New file.
+ * g10/Makefile.am (noinst_PROGRAMS): Add gpgcompose.
+ (gpg2_SOURCES): Split everything but gpg.c into...
+ (gpg_sources): ... this new variable.
+ (gpgcompose_SOURCES): New variable.
+ (gpgcompose_LDADD): Likewise.
+ (gpgcompose_LDFLAGS): Likewise.
+
+ gpg: More robustly detect valid non-armored OpenPGP messages.
+ * g10/armor.c (is_armored): More robustly detect valid non-armored
+ OpenPGP messages.
+
+ common: Provide a function for mapping packet types to strings.
+ * common/openpgpdefs.h (pkttype_str): New function.
+
+ gpg: Rename pop_filter to iobuf_pop_filter and export it.
+ * common/iobuf.c (pop_filter): Rename from this...
+ (iobuf_pop_filter): ... to this. Don't mark it as static.
+
+ gpg: Split write_pubkey_enc_from_list.
+ * g10/encrypt.c (write_pubkey_enc_from_list): Split the body of this
+ function out into...
+ (write_pubkey_enc): ... this new function.
+
+ gpg: Allow the caller to write the contents of a plaintext packet.
+ * g10/build-packet.c (do_plaintext): Change the semantics such that if
+ PT->BUF is NULL, it is the caller's responsibility to write the
+ content (and disable partial body length mode, if appropriate).
+
+ gpg: Add a new function for creating binary notations.
+ * g10/build-packet.c (blob_to_notation): New function.
+
+ gpg: Refactor the printing of binary notations.
+ * g10/build-packet.c (sig_to_notation): Break printing of binary
+ notations into...
+ (notation_value_to_human_readable_string): ... this new function.
+ Provide a small preview of the binary data substituting non-printable
+ characters with '?'.
+
+2016-03-02 Uldis Anšmits <uldis.ansmits at tieto.com>
+
+ tests/openpgp: Make tests more portable.
+ * tests/openpgp/default-key.test: Avoid 'grep -q'.
+ * tests/openpgp/gpgtar.test: Avoid 'grep -qe' and 'diff -q'.
+ * tests/openpgp/use-exact-key.test: Avoid 'grep -q'.
+
+ GnuPG-bug-id: 2262
+
+2016-03-02 Justus Winter <justus at g10code.com>
+
+ common: Consolidate Assuan server argument handling.
+ * common/Makefile.am (common_sources): Add new files.
+ * common/server-help.c: New file.
+ * common/server-help.h: Likewise.
+ * agent/command.c: Drop argument handling primitives in favor of using
+ the consolidated ones.
+ * dirmngr/server.c: Likewise.
+ * g10/server.c: Likewise.
+ * g13/server.c: Likewise.
+ * scd/command.c: Likewise.
+ * sm/server.c: Likewise.
+
+2016-03-01 Justus Winter <justus at g10code.com>
+
+ dirmngr: Add missing CFLAGS.
+ * dirmngr/Makefile.am (t_ldap_parse_uri_CFLAGS): Add
+ 'GPG_ERROR_CFLAGS'.
+ (t_dns_stuff_CFLAGS): Likewise.
+
+ tools: Drop superfluous include.
+ * tools/gpgtar.c: Do not include unused 'npth.h'.
+
+2016-02-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Prettify a 2 octet hex output.
+ * g10/sig-check.c (check_key_signature2): Wrap line and use %02x.
+
+2016-02-25 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Show debugging info if a sig with an unsupported sig class is used.
+ * g10/sig-check.c (check_key_signature2): If SIG->CLASS is
+ unsupported, show some debugging information. Don't use BUG to fail.
+ Just return GPG_ERR_BAD_SIGNATURE.
+
+ gpg: More carefully encode a packet's length.
+ * g10/build-packet.c (write_header2): Make sure the length bits are
+ cleared. Fail if HDRLEN is set and the specified length can't be
+ encoded in the available space.
+
+ gpg: Avoid directly twiddling bits.
+ * g10/build-packet.c (do_plaintext): Use ctb_new_format_p to check the
+ packet's format.
+ (write_header2): Likewise.
+
+ gpg: Add some asserts.
+ * g10/build-packet.c (ctb_new_format_p): New function.
+ (ctb_pkttype): New function.
+ (do_user_id): Add some asserts.
+ (do_key): Likewise.
+ (do_symkey_enc): Likewise.
+ (do_pubkey_enc): Likewise.
+ (do_plaintext): Likewise.
+ (do_encrypted): Likewise.
+ (do_encrypted_mdc): Likewise.
+ (do_compressed): Likewise.
+ (do_signature): Likewise.
+ (do_signature): Likewise.
+ (write_header2): Likewise.
+
+ gpg: Avoid an unnecessary copy.
+ * g10/build-packet.c (sig_to_notation): Avoid an unnecessary copy of
+ the data: the size of the packet is fixed.
+
+2016-02-23 Neal H. Walfield <neal at g10code.com>
+
+ common: Reduce buffer size.
+ * common/iobuf.c (iobuf_copy): Change buffer size from 1 MB to 32 KB.
+
+ common: Improve a function's documentation and comments.
+ * common/iobuf.c (iobuf_set_partial_body_length_mode): Fix
+ documentation and comment. Add an assert.
+
+ common: Add log_assert.
+ * common/logging.h (log_assert): New macro.
+
+ gpg: Use higher-level functions.
+ * g10/build-packet.c (do_symkey_enc): Use iobuf_write instead of
+ iobuf_put in a loop. Use iobuf_copy instead of iobuf_read and
+ iobuf_write in a loop. Move the memory wiping from here...
+ * common/iobuf.c (iobuf_copy): ... to here.
+
+ common: Check for an error before reading.
+ * common/iobuf.c (iobuf_copy): If DEST has a pending error, don't
+ start copying.
+
+ common: More accurately name function.
+ * common/iobuf.c (iobuf_set_partial_block_mode): Rename from this...
+ (iobuf_set_partial_body_length_mode): ... to this. Update callers.
+
+2016-02-23 Werner Koch <wk at gnupg.org>
+
+ g13: Add commands --suspend and --remove.
+ * g13/g13.c (aSuspend, aResume): New.
+ (opts): Add commands --suspend and --resume.
+ (main): Implement dummy command aUmount. Implement commands aResume
+ and aSuspend.
+ * g13/sh-cmd.c (cmd_suspend): New.
+ (cmd_resume): New.
+ (register_commands): Add commands RESUME and SUSPEND.
+ * g13/server.c (cmd_suspend): New.
+ (cmd_resume): New.
+ (register_commands): Add commands RESUME and SUSPEND.
+ * g13/be-dmcrypt.c (be_dmcrypt_suspend_container): New.
+ (be_dmcrypt_resume_container): New.
+ * g13/backend.c (be_suspend_container): New.
+ (be_resume_container): New.
+ * g13/suspend.c, g13/suspend.h: New.
+ * g13/mount.c (parse_header, read_keyblob_prefix, read_keyblob)
+ (decrypt_keyblob, g13_is_container): Move to ...
+ * g13/keyblob.c: new file.
+ (keyblob_read): Rename to g13_keyblob_read and make global.
+ (keyblob_decrypt): Rename to g13_keyblob_decrypt and make global.
+ * g13/sh-dmcrypt.c (check_blockdev): Add arg expect_busy.
+ (sh_dmcrypt_suspend_container): New.
+ (sh_dmcrypt_resume_container): New.
+ * g13/call-syshelp.c (call_syshelp_run_suspend): New.
+ (call_syshelp_run_resume): New.
+
+ g13: Run mount after dmsetup.
+ * g13/g13-syshelp.c (main): Reject userids with a slash.
+ * g13/sh-dmcrypt.c (sh_dmcrypt_mount_container): Run mount if a
+ mountpoint is known.
+
+2016-02-23 Justus Winter <justus at g10code.com>
+
+ tests/openpgp: Qualify executables with extension.
+ * tests/openpgp/Makefile.am (required_pgms): Qualify executables with
+ '$EXEEXT'.
+
+ tests/openpgp: Reimplement 'pinentry.sh' in c.
+ * tests/openpgp/Makefile.am: Build new program.
+ * tests/openpgp/defs.inc: Use the new program.
+ * tests/openpgp/fake-pinentry.c: New file.
+
+ tests/openpgp: Avoid dependency on source files.
+ * tests/openpgp/plain-largeo.asc: New file.
+ * tests/openpgp/version.test: Dearmor the new file instead of relying
+ on the source being present.
+
+ tests/openpgp: Fix file removal.
+ * tests/openpgp/version.test: Fix file removal.
+
+ common/exechelp: Provide a way to wait for multiple processes.
+ * common/exechelp-posix.c (gnupg_wait_process): Generalize to
+ 'gnupg_wait_processes'.
+ * common/exechelp-w32.c (gnupg_wait_process): Likewise.
+ * common/exechelp-w32ce.c (gnupg_wait_process): New function stub.
+ * common/exechelp.h (gnupg_wait_process): New prototype.
+
+ common/exechelp: Add general pipe function.
+ * common/exechelp-posix.c (gnupg_create_pipe): New function.
+ * common/exechelp-w32.c (INHERIT_{READ,WRITE,BOTH}): New macros.
+ (create_inheritable_pipe): Generalize so that both ends can be
+ inherited.
+ (do_create_pipe): Rename argument accordingly.
+ (gnupg_create_{in,out}bound_pipe): Use new flags.
+ (gnupg_create_pipe): New function.
+ (gnupg_spawn_process): Use new flags.
+ * common/exechelp-w32ce.c (gnupg_create_pipe): New stub.
+ * common/exechelp.h (gnupg_create_pipe): New prototype.
+
+ common/exechelp: Mute the Windows version.
+ * common/exechelp-w32.c (gnupg_wait_process): Do not print an error if
+ the exit code can be returned. This makes the Windows version behave
+ like the POSIX version.
+
+ common/exechelp: Avoid magic numbers.
+ * common/exechelp-w32.c (do_create_pipe): Use symbolic names.
+
+ common/exechelp: Disable debugging by default.
+ * common/exechelp-w32.c (DEBUG_W32_SPAWN): Set to 0.
+
+ common/exechelp: Fix handle leak.
+ * common/exechelp-w32.c (gnupg_spawn_process_detached): Close process
+ handle.
+
+ common/exechelp: Fix opening the 'nul' device.
+ * common/exechelp-w32.c (gnupg_spawn_process): Fix opening the 'nul'
+ device.
+
+ common/exechelp: Fix error handling.
+ * common/exechelp-w32.c (gnupg_spawn_process): Close the right handle.
+
+ common/exechelp: Fix pipe creation.
+ * common/exechelp-w32.c (gnupg_spawn_process): Fix the creation of the
+ input pipe.
+
+ tools/mk-tdata: Fix data generation on Windows.
+ * tools/mk-tdata.c (main): Set stdout to binary mode to avoid newline
+ conversion.
+
+2016-02-19 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Systematically detect and fix signatures that are out of order.
+ * g10/keyedit.c (sig_comparison): New function.
+ (fix_key_signature_order): Merge functionality into...
+ (check_all_keysigs): ... this function. Rewrite to eliminate
+ duplicates and use a systematic approach to detecting and moving
+ signatures that are out of order instead of a heuristic.
+ (fix_keyblock): Don't call fix_key_signature_order. Call
+ check_all_keysigs instead after collapsing the uids.
+
+ gpg: Split check_key_signature2.
+ * g10/sig-check.c (hash_uid_node): Rename from this...
+ (hash_uid_packet): ... to this. Take a PKT_user_id instead of a
+ KBNODE.
+ (check_key_signature2): Split the basic signature checking
+ functionality into...
+ (check_signature_over_key_or_uid): ... this new function.
+
+ gpg: Split print_and_check_one_sig.
+ * g10/keyedit.c (print_and_check_one_sig): Split the print
+ functionality into...
+ (print_one_sig): ... this new function.
+
+ gpg: Split the function check_signature_end.
+ * g10/sig-check.c (check_signature_end): Break the basic signature
+ check into...
+ (check_signature_end_simple): ... this new function.
+
+ gpg: Use format_keyid rather than manually formatting the keyid.
+ * g10/keyedit.c (menu_addrevoker): Use format_keyid rather than
+ manually formatting the keyid.
+ * g10/keygen.c (card_write_key_to_backup_file): Likewise.
+
+ gpg: Initialize the primary key when generating a key.
+ * g10/keygen.c (do_generate_keypair): Initialize
+ pri_psk->flags.primary, pri_psk->keyid and pri_psk->main_keyid.
+
+ gpg: Add accessor & utility functions for pk->keyid and pk->main_keyid.
+ * g10/keydb.h (keyid_cmp): New function.
+ * g10/keyid.c (pk_keyid): New function.
+ (pk_main_keyid): New function.
+ (keyid_copy): New function.
+ (pk_keyid_str): New function.
+ * g10/packet.h (PKT_public_key): Update comments for main_keyid and
+ keyid.
+
+2016-02-18 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpgparsemail: Allow weirdly-mixed pkcs7 signatures.
+ * tools/gpgparsemail.c: Add and check info->signing_protocol_2.
+
+ gpg: Clean up dangling agent_open and agent_closed declarations.
+ * g10/keydb.h: Remove agent_open, agent_close declarations/
+ * g10/migrate.c: #include <unistd.h> for access()
+
+2016-02-16 Werner Koch <wk at gnupg.org>
+
+ w32: Make scdaemon build again due to libusb problem.
+ * configure.ac: Add hack to disable libusb for Windows. Also use
+ $host instead of $target in the switch
+ --
+
+ The new test for libusb does not support cross-compiling. As a quick
+ workaround we disable libusb for Windows because we can't use it anyway.
+
+ w32: Do not error out if gpgconf is not installed.
+ * common/homedir.c (check_portable_app): Remove error message.
+
+2016-02-16 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Make ASCII armor decoding more robust to encoding errors.
+ * g10/armor.c (radix64_read): If the = is followed by the string "3D",
+ check if the following four characters are valid radix 64 and are
+ followed by a new line. If so, warn and ignore the '3D'.
+
+2016-02-16 Werner Koch <wk at gnupg.org>
+
+ doc: Add a gnupg-module-overview picture.
+ * doc/gnupg-module-overview.svg: New.
+ * doc/debugging.texi (Component interaction): New.
+ * doc/Makefile.am (EXTRA_DIST): Add PNG and PDF versions of
+ gnupg-module-overview.svg. Remove two eps files.
+ (BUILT_SOURCES): Add gnupg-module-overview.pdf and .png. Remove
+ gnupg-card-architecture.epsl
+ (gnupg_TEXINFOS): Add gnupg-module-overview.svg
+ (gnupg.dvi): New.
+ (DISTCLEANFILES): Remove build eps files.
+
+2016-02-15 NIIBE Yutaka <gniibe at fsij.org>
+
+ common, g10: Fix indentation to silence GCC-6.
+ * common/iobuf.c (iobuf_ioctl): Fix.
+ * g10/encrypt.c (encrypt_filter): Likewise.
+ * g10/keyring.c (prepare_search): Likewise.
+
+ dirmngr: fix for memory alignment.
+ * dirmngr/dns-stuff.c (get_dns_cert): Cast through void *.
+ (getsrv, get_dns_cname): Make sure it's aligned for HEADER.
+
+2016-02-14 Werner Koch <wk at gnupg.org>
+
+ gpg: Add hidden key-edit subcommand "change-usage".
+ * g10/keyedit.c (cmdCHANGEUSAGE): New.
+ (cmds): Add command "change-usage".
+ (keyedit_menu): Handle that command.
+ (menu_changeusage): New.
+ * g10/keygen.c (keygen_add_key_flags): New.
+ (ask_key_flags): Add optional arg current.
+
+2016-02-14 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Improve API documentation.
+ * g10/seskey.c (make_session_key): Improve documentation.
+ (encode_session_key): Improve documentation.
+ * g10/encrypt.c (encrypt_seskey): Remove gratuitous initialization.
+ * g10/dek.h (DEK): Improve documenation.
+
+ gpg: Fix calc_header_length when LEN is 0 and improve documentation.
+ * g10/build-packet.c (calc_header_length): Return the correct haeder
+ size when LEN is 0. Fix documentation.
+
+ gpg: Fix format_keyid when dynamically allocating the buffer.
+ * g10/keyid.c (format_keyid): Return a char *, not a const char *. If
+ BUFFER is NULL, then set LEN to the static buffer's size.
+
+ common: Fix comment.
+ * common/iobuf.c (iobuf_flush_temp): Fix comment.
+
+2016-02-13 Werner Koch <wk at gnupg.org>
+
+ g13: Require a confirmation before g13 is used for DM-Crypt.
+ * g13/g13-syshelp.c (g13_syshelp_i_know_what_i_am_doing):
+ * g13/sh-dmcrypt.c (sh_dmcrypt_create_container): Call it.
+ (sh_dmcrypt_mount_container): Call it.
+
+ g13: Second chunk of code to support dm-crypt.
+ * g13/be-dmcrypt.c, g13/be-dmcrypt.h: New.
+ * g13/Makefile.am (g13_SOURCES): Add them.
+ * g13/backend.c: Include be-dmcrypt.h and call-syshelp.h.
+ (no_such_backend): Rename to _no_such_backend and provide replacement
+ macro.
+ (be_is_supported_conttype): Support DM-Crypt.
+ (be_take_lock_for_create): Call set_segvice for DM-Crypt.
+ (be_create_new_keys): Make it a dummy for DM-Crypt.
+ (be_create_container): Call be_dmcrypt_create_container.
+ (be_mount_container): call be_dmcrypt_mount_container.
+ * g13/g13-syshelp.c (main): Enable verbose mode.
+ * g13/g13tuple.c (get_tupledesc_data): New.
+ * g13/g13tuple.h (unref_tupledesc): New.
+ * g13/g13.h (server_control_): Add field "recipients".
+ * g13/g13.c (main): Fix setting of recipients via cmdline.
+ (g13_deinit_default_ctrl): Release recipients list.
+ (g13_request_shutdown): New. Replace all direct update of
+ shutdown_pending by calls this function.
+ * g13/server.c (server_local_s): Remove field recipients which is now
+ part of CTRL.
+ (reset_notify, cmd_recipient, cmd_create): Adjust for this change.
+ * g13/create.c (encrypt_keyblob): Rename to g13_encrypt_keyblob.
+ (g13_create_container): Support DM-Crypt.
+ * g13/mount.c (parse_header): Allow for meta data copies.
+ (g13_mount_container): Support DM-Crypt.
+ * g13/sh-cmd.c (cmd_create): Make it work.
+ (cmd_mount): New.
+ * g13/sh-dmcrypt.c (sh_dmcrypt_create_container): Make it work.
+ (sh_dmcrypt_mount_container): New.
+
+ g13: Improve dump_keyblob.
+ * g13/g13tuple.c: Include keyblob.h.
+ (find_tuple_uint): Factor code out to ...
+ (convert_uint): new.
+ (all_printable): New.
+ * g13/mount.c (dump_keyblob: Move and rename to ...
+ * g13/g13tuple.c (dump_tupledesc): here. Revamp and pretyy print uint
+ values.
+
+ g13: Define 3 new tags.
+ * g13/keyblob.h (KEYBLOB_TAG_CONT_NSEC): New.
+ (KEYBLOB_TAG_ENC_NSEC): New.
+ (KEYBLOB_TAG_ENC_OFF): New.
+
+ g13: Rename utils.c to g13tuple.c.
+ * g13/utils.c: Rename to g13tuple.c.
+ * g13/utils.h: Rename to g13tuple.h. Change all users.
+ * g13/Makefile.am: Adjust accordingly
+
+ g13: Add functions to handle uint in a keyblob.
+ * g13/utils.c (append_tuple_uint): New.
+ (find_tuple_uint): New.
+ * g13/t-utils.c: New.
+ * g13/Makefile.am (noinst_PROGRAMS, TESTS): New.
+ (module_tests, t_common_ldadd): New.
+ (t_utils_SOURCES, t_utils_LDADD): New.
+
+ g13: Re-factor high level create code.
+ * g13/create.c (g13_create_container): Factor some code out to ...
+ * g13/backend.c (be_take_lock_for_create): new.
+
+ g13: Return an error for non-existing device.
+ * g13/sh-cmd.c (cmd_device): Set ERR.
+
+ g13: Fix releasing of a syshelp context.
+ * g13/call-syshelp.c (call_syshelp_release): Allow a NULL arg.
+
+ g13: Switch over to common/exectool.c.
+ * g13/sh-exectool.c: Remove. It has been replaced by common/exectool.c.
+ * g13/Makefile.am (g13_syshelp_SOURCES): Remove sh-exectool.c
+ * g13/sh-blockdev.c: Include exectool.h. Change sh_exec_tool to
+ gnupg_exec-tool.
+ * g13/sh-dmcrypt.c: Ditto.
+
+ common: Make gnupg_exec_tool conform to spec.
+ * common/exectool.c (gnupg_exec_tool): Allocate extra byte. Allow
+ zero length read. Append hidden byte. Release memory on error.
+
+ g13: First chunk of code to support dm-crypt.
+ * g13/call-syshelp.c, g13/call-syshelp.h: New.
+ * g13/g13-syshelp.c, g13/g13-syshelp.h: New.
+ * g13/sh-cmd.c: New.
+ * g13/sh-blockdev.c: New.
+ * g13/sh-exectool.c: New.
+ * g13/sh-dmcrypt.c: New.
+ * g13/Makefile.am (sbin_PROGRAMS): Add g13-syshelp.c
+ (g13_syshelp_SOURCES): New.
+ (g13_syshelp_LDADD): New.
+
+ * g13/g13.c (opts): Add option --type.
+ (g13_deinit_default_ctrl): New.
+ (main): Implement that option. Call g13_deinit_default_ctrl.
+ * g13/g13.h (struct call_syshelp_s): New declaration.
+ (server_control_s): Add field syshelp_local.
+ * g13/keyblob.h (KEYBLOB_TAG_CREATED): New.
+ (KEYBLOB_TAG_ALGOSTR): New.
+ (KEYBLOB_TAG_HDRCOPY): New.
+ * g13/backend.c (be_parse_conttype_name): New.
+ (be_get_detached_name): Add CONTTYPE_DM_CRYPT.
+
+ tests: Remove some harmless warnings in regression tests.
+ * tests/openpgp/gpg-agent.conf.tmpl: Remove --use-standard-socket.
+
+2016-02-12 Neal H. Walfield <neal at g10code.com>
+
+ common: Change simple_query to ignore status messages.
+ * common/simple-pwquery.c (simple_query): Ignore status messages.
+
+2016-02-12 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Make sure to have the directory for trustdb.
+ * g10/tdbio.c (tdbio_set_dbname): Return earlier if !CREATE. Check
+ the directory and create it if none before calling take_write_lock.
+
+2016-02-02 Neal H. Walfield <neal at g10code.com>
+
+ doc: Note that rngd can also be used to quickly generate insecure keys.
+ * doc/gpg-agent.texi (Agent Options): Add comment to the description
+ of --debug-quick-random that rngd can also be used to quickly generate
+ key.
+
+2016-01-27 Werner Koch <wk at gnupg.org>
+
+ scd: Fix size_t/int mismatch in libusb.
+ * scd/ccid-driver.c (bulk_in, abort_cmd, ccid_poll): Change msglen to
+ int.
+
+ scd: Fix detection of libusb.
+ * configure.ac (HAVE_LIBUSB): Clear if no header file was found.
+ (LIBUSB_LIBS): Ditto.
+
+ dirmngr: Build fix for FreeBSD (EAI macros)
+ * dirmngr/dns-stuff.c (map_eai_to_gpg_error): Map EAI_NODATA and
+ EAI_ADDRFAMILY only if defined.
+
+2016-01-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Migrate to new API of libusb 1.0.
+ * configure.ac (LIBUSB_CPPFLAGS): New.
+ * scd/Makefile.am (AM_CPPFLAGS): Add LIBUSB_CPPFLAGS.
+ * scd/ccid-driver.c: Use libusb 1.0 API.
+
+2016-01-26 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.11.
+
+2016-01-26 Andre Heinecke <aheinecke at intevation.de>
+
+ gpgtar,w32: Fix gpgtar 8 bit encoding handling on W32.
+ * common/utf8conv.c (wchar_to_utf8): Factor code out to ...
+ (wchar_to_cp): new.
+ (utf8_to_wchar): Factor code out to ...
+ (cp_to_wchar): new.
+ (wchar_to_native): New.
+ (native_to_wchar): New.
+ * tools/gpgtar-create.c (fillup_entry_w32): Use native_to_wchar.
+ (scan_directory): Use wchar_to_native.
+
+2016-01-26 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Fix segfault on unsupported curve.
+ * g10/call-agent.c (learn_status_cb): Don't use NULL for strcmp.
+
+ sm: small fix for GCC 6.
+ * sm/export.c (insert_duptable): Use unsigned 0.
+
+2016-01-25 Werner Koch <wk at gnupg.org>
+ Daiki Ueno <ueno at gnu.org>
+
+ gpg: Print PROGRESS status lines during key generation.
+ * g10/call-agent.c (cache_nonce_status_cb): Rewrite by using
+ has_leading_keyword. Handle PROGRESS lines.
+
+2016-01-25 Werner Koch <wk at gnupg.org>
+
+ agent: Send PROGRESS status lines to the client.
+ * agent/gpg-agent.c (struct progress_dispatch_s): New.
+ (progress_dispatch_list): New.
+ (main): Register libgcrypt pogress handler.
+ (agent_libgcrypt_progress_cb): New.
+ (agent_set_progress_cb): New.
+ (unregister_progress_cb): New.
+ (agent_deinit_default_ctrl): Call unregister.
+ * agent/command.c (progress_cb): New.
+ (start_command_handler): Register progress callback.
+
+ speedo: Allow use of SHA-256 checksums.
+ * build-aux/getswdb.sh: Add option --find-sha256sum.
+ * build-aux/speedo.mk (libgpg_error_sha2): New var. Also for all
+ other packages.
+ (SHA2SUM): New.
+ (SETVARS, SETVARS_W64): Prefer sha256sum over sha1sum.
+ (installer-from-source): Create swdb fragment.
+
+2016-01-22 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Indicate that serial numbers are hexadecimal.
+ * dirmngr/misc.c (hexify_data): Add arg with_prefix. Adjust all
+ callers.
+ * dirmngr/crlcache.c (cache_isvalid): Print "0x" in front of the S/N.
+
+ dirmngr: Provide the keyserver pool name even if there is no CNAME.
+ * dirmngr/ks-engine-hkp.c (map_host): Fix setting of r_poolname.
+
+2016-01-22 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+ wk at gnupg.org
+
+ dirmngr: Use sks-keyservers CA by default for the hkps pool.
+ * dirmngr/Makefile.am (dist_pkgdata_DATA): Add sks-keyservers.netCA.pem.
+ * dirmngr/http.c (http_session_new): Add optional arg
+ intended_hostname and set a default cert.
+ * dirmngr/ks-engine-hkp.c (send_request): Pass httphost to
+ http_session_new.
+
+2016-01-22 Werner Koch <wk at gnupg.org>
+
+ gpg: Allow new user ids with only the mail address.
+ * g10/keygen.c (ask_user_id): Allow empty name.
+
+2016-01-21 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve header text of the auto-created revocations.
+ * g10/revoke.c (gen_standard_revoke): Improve header text for the
+ file. Add info output.
+
+ gpg: Make --auto-key-retrieve work with dirmngr configured server.
+ * g10/call-dirmngr.c (gpg_dirmngr_ks_list): Make R_KEYSERVER optional.
+ * g10/keyserver.c (keyserver_any_configured): New.
+ (keyserver_put): Remove arg keyserver because this will always receive
+ opt.keyserver which is anyway used when connecting dirmngr. Do not
+ check opt.keyserver.
+ (keyserver_import_cert): Replace opt.keyserver by
+ keyserver_any_configured.
+ * g10/mainproc.c (check_sig_and_print): Ditto.
+ * g10/import.c (revocation_present): Ditto.
+ * g10/getkey.c (get_pubkey_byname): Ditto.
+ * g10/gpgv.c (keyserver_any_configured): Add stub.
+ * g10/test-stubs.c (keyserver_any_configured): Add stub.
+
+2016-01-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Silence message about ignoring revoked user ids.
+ * g10/trustdb.c (tdb_get_validity_core): Print message only in debug
+ mode.
+
+ agent: New option --pinentry-timeout.
+ * agent/gpg-agent.c (oPinentryTimeout): New.
+ (opts): Add new option.
+ (parse_rereadable_options): PArse that option.
+ (main): Tell gpgconf about this option.
+ * agent/call-pinentry.c (start_pinentry): Send option to Pinentry.
+ * tools/gpgconf-comp.c (gc_options_gpg_agent): Add Option.
+
+2016-01-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Streamline use of error messages in tofu.c.
+ * g10/tofu.c: Make use of print_further_info to reduce the number of
+ different error messages to be translated. Also streamline some
+ messages.
+
+ common: Add substitute code for libgpg-error < 1.22.
+ * common/util.h (GPG_ERR_DB_CORRUPTED): New.
+
+ gpg: Add function print_further_info.
+ * g10/misc.c (print_further_info): New.
+
+2016-01-18 Werner Koch <wk at gnupg.org>
+
+ g10: Improve strings printed by tofu.c.
+ * g10/tofu.c: Include ttyio.h. Change many strings to help
+ translating. Make use of ngettext wehere needed.
+ (CONTROL_L): New.
+ (TIME_AGO_UNIT_SMALL_NAME): Remove this and all similar *_NAME macros.
+ (time_ago_unit): Remove.
+ (get_trust): Use tty_prints and cpr_get only for the actual prompt.
+ Add Ctrl-L hack.
+ (show_statistics): Use two English strings for singular and plural.
+
+ * po/POTFILES.in: Add tofu.c.
+
+ gpg: Use "days" in "...newer than..." diagnostics.
+ * g10/sig-check.c (check_signature_metadata_validity): Use days if
+ useful.
+
+ Use ngettext for some strings.
+ * scd/app-openpgp.c (build_enter_admin_pin_prompt): Use ngettext for
+ some diagnostics.
+ (do_genkey): Ditto.
+ * g10/keyedit.c (check_all_keysigs, menu_delsig, menu_clean): Ditto.
+ * g10/keylist.c (print_signature_stats): Ditto.
+ * g10/keyserver.c (keyserver_refresh): Ditto.
+ * g10/sig-check.c (check_signature_metadata_validity): Ditto.
+ * g10/sign.c (do_sign): Ditto.
+ * g10/trustdb.c (reset_trust_records): Ditto.
+ (validate_keys): Use a table like diagnostic output.
+
+2016-01-15 Werner Koch <wk at gnupg.org>
+
+ kbx,w32: Use shorter retry intervals for keybox_file_rename.
+ * kbx/keybox-util.c (keybox_file_rename): Restart retry intervals
+ after 800ms.
+
+2016-01-14 Werner Koch <wk at gnupg.org>
+
+ w32: Fix deadlock introduced by keybox_file_rename.
+ * g10/keyring.c (keyring_lock) [W32]: Flush the close cache before
+ locking.
+ * kbx/keybox-init.c (keybox_lock) [W32]: Close the file before
+ locking.
+
+ gpg: Detect race between pubring.gpg and pubring.kbx use.
+ * g10/keydb.c (maybe_create_keyring_or_box): Detect race condition.
+
+ kbx: New function keybox_file_rename to replace rename.
+ * kbx/keybox-util.c: Include windows.h.
+ (keybox_file_rename): New.
+ * kbx/keybox-update.c (rename_tmp_file): Replace remove+rename by
+ keybox_file_rename.
+ * g10/keyring.c (rename_tmp_file): Ditto.
+
+ kbx: Add function keybox_tmp_names to avoid code duplication.
+ * kbx/keybox-update.c (create_tmp_file): Move some code to...
+ * kbx/keybox-util.c (keybox_tmp_names): new.
+ * g10/keyring.c: Include keybox.h.
+ (create_tmp_file): Replace parts by keybox_tmp_names.
+
+ gpg: Make --list-options show-usage the default.
+ * g10/gpg.c (main): Add LIST_SHOW_USAGE.
+
+2016-01-13 Werner Koch <wk at gnupg.org>
+
+ kbx: Change return type of search functions to gpg_error_t.
+ * kbx/keybox-search.c (keybox_search_reset): Change return type to
+ gpg_error_t.
+ (keybox_search): Ditto. Also handle GPG_ERR_EOF.
+ * sm/keydb.c (keydb_search_reset): Ditto.
+
+ gpg: Improve error code from lock_all.
+ * g10/keydb.c (lock_all): Do not clobber RC during failur cleanup.
+
+ kbx: Improve and fix keybox_lock.
+ * kbx/keybox-init.c (keybox_lock): Make sure ERR is initialized. Get
+ error codes from dotlock functions.
+
+ common: Make sure dotlock functions set a proper ERRNO.
+ * common/dotlock.c (map_w32_to_errno): New.
+ (read_lockfile): Return a proper ERRNO.
+ (dotlock_create_unix): Do not let log functions clobber ERRNO.
+ (dotlock_take_unix): Ditto.
+ (dotlock_release_unix): Ditto.
+ (dotlock_create_w32): Set proper ERRNO.
+ (dotlock_take_w32): Ditto.
+ (dotlock_release_w32): Ditto.
+
+ kbx: Implement keybox_lock for use by gpg.
+ * kbx/keybox-defs.h: Include dotlock.h and logging.h.
+ (CONST_KB_NAME): Remove. Replace usage by KB_NAME.
+ (struct keybox_name): Add field "lockhd".
+ * kbx/keybox-init.c (keybox_register_file): Init LOCKHD.
+ (keybox_lock): Chnage to return gpg_error_t. Implement locking.
+
+ gpg: Make sure to mark a duplicate registered keybox as primary.
+ * kbx/keybox-init.c (keybox_register_file): Change interface to return
+ the token even if the file has already been registered.
+ * g10/keydb.c (primary_keyring): Rename to primary_keydb.
+ (maybe_create_keyring_or_box): Change return type to gpg_error_t.
+ (keydb_add_resource): Ditto. s/rc/err/.
+ (keydb_add_resource): Mark an already registered as primary.
+ * sm/keydb.c (maybe_create_keybox): Change return type to gpg_error_t.
+ (keydb_add_resource): Ditto. s/rc/err/.
+ (keydb_add_resource): Adjust for changed keybox_register_file.
+
+2016-01-13 NIIBE Yutaka <gniibe at fsij.org>
+
+ Fix to support git worktree.
+ * autogen.sh, Makefile.am, doc/Makefile.am: Use -e for testing .git.
+
+2016-01-12 Werner Koch <wk at gnupg.org>
+
+ ssh: Accept OpenSSH *cert-v01 key variants.
+ * agent/command-ssh.c (SPEC_FLAG_WITH_CERT): New.
+ (ssh_key_types): Add OpenSSH cert types.
+ (stream_read_string): Allow a dummy read.
+ (ssh_receive_mpint_list): Pass SPEC by reference.
+ (ssh_receive_mpint_list): New arg CERT and use it.
+ (ssh_receive_key): Read certificate into an estream object and modify
+ parser to make use of that object.
+
+2016-01-12 NIIBE Yutaka <gniibe at fsij.org>
+
+ common: Fix iobuf API of filter function for alignment.
+ * common/iobuf.h: Fix comment.
+
+ common: Fix iobuf API of filter function for alignment.
+ * common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
+ * common/iobuf.c (iobuf_desc): Add the second argument DESC.
+ (print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
+ (iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
+ of iobuf_desc.
+ (file_filter, file_es_filter, sock_filter, block_filter): Fill the
+ description.
+ * common/t-iobuf.c (every_other_filter, double_filter): Likewise.
+ * g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
+ g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
+ g10/textfilter.c: Likewise.
+
+2016-01-11 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix NULL de-ref for ambiguous key check in --export-ssh-keys.
+ * g10/getkey.c: Allow arg RET_KEYBLOCK to be NULL.
+
+2016-01-09 Werner Koch <wk at gnupg.org>
+
+ tools: Remove gpgkey2ssh.
+ * tools/gpgkey2ssh.c: Remove.
+ * tools/Makefile.am (bin_PROGRAMS): Ditto.
+
+2016-01-08 Werner Koch <wk at gnupg.org>
+
+ gpg: Support ECDSA keys with --export-ssh-key.
+ * g10/export.c (key_to_sshblob): Add hack for ECDSA.
+
+ gpg: New command --export-ssh-key.
+ * g10/export.c: Include membuf.h and host2net.h.
+ (key_to_sshblob): New.
+ (export_ssh_key): New.
+ * g10/gpg.c (aExportSshKey): New.
+ (opts): Add command.
+ (main): Implement that command.
+
+ gpg: Add an exact search flag to the PK struct.
+ * g10/getkey.c (merge_selfsigs_subkey): Clear exact flag.
+ (finish_lookup): Set exact flag.
+ * g10/packet.h (PKT_public_key): Add field flags.exact.
+
+ Print warnings if old daemon versions are used.
+ * common/status.h (STATUS_WARNING): New.
+ * g10/call-agent.c (warn_version_mismatch): New.
+ (start_agent): Call warn function.
+ * g10/call-dirmngr.c: Include status.h.
+ (warn_version_mismatch): New.
+ (create_context): Call warn function.
+ * sm/call-agent.c (warn_version_mismatch): New.
+ (start_agent): Call warn function.
+ (gpgsm_agent_learn): Call warn function.
+ * sm/call-dirmngr.c (warn_version_mismatch): New.
+ (prepare_dirmngr): Call warn function.
+
+ common: New function compare_version_strings.
+ * common/stringhelp.c (parse_version_number): New.
+ (parse_version_string): New.
+ (compare_version_strings): New.
+ * common/t-stringhelp.c (test_compare_version_strings): New.
+ (main): Call test. Return ERRCOUNT instead of 0.
+
+ common: New function get_assuan_server_version.
+ * common/asshelp.c: Include membuf.h.
+ (get_assuan_server_version): New.
+ * g10/call-agent.c (agent_get_version): Use new function.
+
+ common: New put_membuf_cb to replace static membuf_data_cb.
+ * common/membuf.c (put_membuf_cb): New.
+ * agent/call-scd.c (membuf_data_cb): Remove. Change callers to use
+ put_membuf_cb.
+ * common/get-passphrase.c (membuf_data_cb): Ditto.
+ * g10/call-agent.c (membuf_data_cb): Ditto.
+ * sm/call-agent.c (membuf_data_cb): Ditto.
+
+2016-01-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Return an error code from keygrip_from_pk.
+ * g10/keyid.c (keygrip_from_pk): Return an error code.
+
+ gpg: Avoid warnings about possible NULL deref.
+ * g10/getkey.c (cache_public_key): Protect deref of CE which actually
+ can't happen.
+ * g10/keygen.c (quickgen_set_para): s/sprintf/snprintf/.
+ * g10/tofu.c (end_transaction, rollback_transaction): Allow NULL for
+ DB.
+ * g10/trustdb.c (update_min_ownertrust): Remove useless clearling of
+ ERR.
+
+ gpg: Fix warnings about useless assignments.
+ * g10/armor.c (parse_hash_header): Remove duplicate var assignment.
+ * g10/getkey.c (cache_user_id): Ditto.
+ * g10/keygen.c (ask_curve): Ditto. This also fixes a small memory
+ leak.
+
+ * g10/keygen.c (proc_parameter_file): Remove useless assignment or
+ pointer increment.
+ (generate_keypair): Ditto.
+ * g10/getkey.c (finish_lookup, lookup): Ditto.
+ * g10/card-util.c (change_pin): Ditto.
+ * g10/gpg.c (main) <aVerify>: Ditto.
+ * g10/import.c (import): Ditto.
+ (print_import_check): Ditto
+ * g10/keyring.c (do_copy): Ditto.
+ * g10/tdbio.c (tdbio_read_record): Ditto.
+ * g10/trustdb.c (tdb_update_ownertrust): Ditto.
+ (update_validity): Ditto.
+
+ * g10/server.c (cmd_passwd): Remove useless call to skip_options.
+
+ sm: Avoid warnings about useless assignments.
+ * sm/call-dirmngr.c (prepare_dirmngr): Remove setting of ERR.
+ (unhexify_fpr): Remove useless computation on N.
+ * sm/certchain.c (do_validate_chain): Remove clearing of RC. Remove
+ useless setting of RC.
+ * sm/fingerprint.c (gpgsm_get_keygrip): Remove setting of RC.
+ * sm/gpgsm.c (build_list): Replace final stpcpy by strcpy.
+ * sm/keydb.c (keydb_clear_some_cert_flags): Remove clearing of RC.
+ * sm/server.c (cmd_getauditlog): Comment unused skip_options.
+
+ kbx: Avoid warnings about useless assignments.
+ * kbx/keybox-dump.c (_keybox_dump_blob): Remove setting of IN_RANGE
+ and the last increment of P.
+
+ gpg: Fix DNS cert lookup returning an URL.
+ * g10/call-dirmngr.c (dns_cert_status_cb): Store URL status in the URL
+ param. The old code was entirely buggy (c+p error).
+
+2016-01-06 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ Fix keystrlen to work when OPT.KEYID_FORMAT is KF_DEFAULT.
+ * g10/keyid.c (keystrlen): If opt.keyid_format is KF_DEFAULT unset,
+ default to KF_SHORT.
+ (format_keyid): Default to KF_SHORT, not KF_0xLONG.
+
+2016-01-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Silence some regression tests.
+ * g10/test.c (TEST): Print diagnostics only in verbose mode.
+
+ gpg: Avoid using an uninitialized SALT on premature EOF.
+ * g10/parse-packet.c (parse_key): Check for premature end of salt.
+
+ gpg: Silence warnings found by static analyzer.
+ * g10/keyedit.c (change_passphrase): Remove useless init of ANY.
+ (keyedit_quick_adduid): Remove useless setting of ERR.
+ * g10/parse-packet.c (parse_key): Remove PKTLEN from condition because
+ it has been checked before the loop.
+ (parse_plaintext): Remove useless init of PKTLEN.
+
+ kbx: Avoid faulty fclose in an error case.
+ * kbx/keybox-update.c (blob_filecopy): Do not close an uninitialized
+ file pointer after a failure to create a temp file.
+ * kbx/keybox-openpgp.c (next_packet): Remove duplicate assignment of
+ PKTLEN.
+
+ dirmngr: Silence one regression test.
+ * dirmngr/t-dns-stuff.c (main): Do not print info during standard
+ "make check".
+
+ common: Avoid warnings about useless assignments.
+ * common/b64enc.c (b64enc_finish): Remove var assignment which is not
+ used later.
+ * common/iobuf.c (file_filter): Ditto.
+ * common/tlv.c (do_find_tlv): Ditto.
+ * common/userids.c (classify_user_id): Ditto.
+
+ tests: Use info and error instead of a plain echo.
+ * tests/openpgp/4gb-packet.test: Use error and info.
+
+ common: Do not deref vars in tests after a fail().
+ * common/t-convert.c (test_bin2hex): Turn if conditions into if-else
+ chains to avoid accessing unchecked data.
+ (test_bin2hexcolon): Ditto.
+ * common/t-mapstrings.c (test_map_static_macro_string): Ditto.
+ * common/t-stringhelp.c (test_percent_escape): Ditto.
+ (test_make_filename_try): Ditto.
+ (test_make_absfilename_try): Ditto.
+ * common/t-timestuff.c (test_timegm): Ditto.
+
+2016-01-05 Werner Koch <wk at gnupg.org>
+
+ gpg: Align notes about minimal keysize with actual checks.
+ * g10/keygen.c (ask_keysize): Use 768 for the minimal value for DSA in
+ export mode. Improve readability.
+
+2016-01-05 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix RSA verification for card.
+ * agent/pksign.c (agent_pksign_do): Use S-exp of public key, instead
+ of shadowed key.
+
+2016-01-04 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix double free.
+ * g10/getkey.c (get_pubkeys): Fix double free.
+
+2015-12-24 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: IMPORT_KEY with --force option fix.
+ * agent/cvt-openpgp.c (convert_from_openpgp_main): Add an option not
+ to check existing key.
+ (convert_from_openpgp): Ditto.
+ (convert_from_openpgp_native): Call convert_from_openpgp_main with
+ dontcare_exist=0.
+ * agent/command.c (cmd_import_key): Call with dontcare_exist=force.
+
+ g10: Use --force when importing key for bkuptocard.
+ * g10/call-agent.c (agent_import_key): Add an argument FORCE.
+ * g10/import.c (transfer_secret_keys): Likewise.
+ (import_secret_one): Call transfer_secret_keys with FORCE=0.
+ * g10/keyedit.c (keyedit_menu): Call with FORCE=1.
+
+ g10: Remove subcommand checkbkupkey for --key-edit.
+ * g10/keyedit.c (keyedit_menu): Remove cmdCHECKBKUPKEY support.
+
+ g10: Allow relative path for specifying the file for bkuptocard.
+ * g10/keyedit.c (keyedit_menu): Assume the file is under GNUPGHOME.
+ Also support tilda expansion.
+
+ g10: fix regression of bkuptocard subcommand in --edit-key.
+ * g10/keyedit.c (keyedit_menu): Call transfer_secret_keys.
+ * g10/import.c (transfer_secret_keys): Make it global function.
+ Allow stats==NULL.
+
+ agent: Support --force option for IMPORT_KEY.
+ * agent/command.c (cmd_keywrap_key): New option --force.
+
+2015-12-23 Werner Koch <wk at gnupg.org>
+
+ gpg: Rename struct pubkey to pukey_s and add pubkey_t.
+ * g10/keydb.h (struct pubkey): Rename to pubkey_s.
+ (pubkey_t): New. Change all struct pubkey_s to use this type.
+ * g10/getkey.c (get_pubkeys): Rename arg keys to r_keys.
+
+ gpg: Simplify status message code from commit b30c15bf.
+ * g10/keygen.c (card_write_key_to_backup_file): Simplify by using
+ hexfingerprint.
+
+ gpg: Add standard free() semantic to pubkey_free.
+ * g10/getkey.c (pubkey_free): Check for NULL arg.
+
+ gpg: Fix use of assert from commit dc417bf0.
+ * g10/keydb.c (keydb_update_keyblock): De-ref after the assert. Use
+ %zu for size_t.
+
+ gpg: Do not translate debug output.
+ * g10/getkey.c (parse_def_secret_key): Do not make strings passed to
+ log_debug translatable.
+
+2015-12-23 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix commit b30c15bf (again).
+ * g10/keygen.c (do_generate_keypair): Clear the variable S.
+
+2015-12-22 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix type.
+ * g10/keygen.c (card_write_key_to_backup_file): Change n to a size_t.
+
+ gpg: Fix error message.
+ * g10/getkey.c (parse_def_secret_key): Fix error message.
+
+ gpg: Don't check for ambiguous keys.
+ * g10/gpg.c (struct result): Move from here...
+ * g10/keydb.h (struct pubkey): ... to here. Update users.
+ * g10/gpg.c (check_user_ids): Move from here...
+ * g10/getkey.c (get_pubkeys): ... to here. Update users. Use
+ get_pubkey_byname to look up the keys (this also prunes invalid keys).
+ (pubkey_free): New function.
+ (pubkeys_free): New function.
+ * g10/gpg.c (main): Don't check for ambiguous key specifications.
+
+ gpg: Lazily evaluate --default-key.
+ * g10/gpg.c (main): If --encrypt-to-default-key is specified, don't
+ add --default-key's value to REMUSR here...
+ * g10/pkclist.c (build_pk_list): ... do it here.
+ * tests/openpgp/Makefile.am (TESTS): Add default-key.test.
+ * tests/openpgp/default-key.test: New file.
+
+ gpg: Remove unused parameter.
+ * g10/pkclist.c (build_pk_list): Remove parameter use, which is always
+ called set to PUBKEY_USAGE_ENC. Update callers.
+
+ gpg: Improve check for ambiguous keys.
+ * g10/gpg.c (check_user_ids): When checking for ambiguous keys, ignore
+ encryption-only keys when a signing key is needed and vice-versa.
+
+ gpg: Fix TOCTTOU when updating keyblocks.
+ * g10/keydb.c (keydb_update_keyblock): Don't replace the record at the
+ current offset. After taking the lock, extract the fingerprint from
+ the keyblock, find it and then replace it.
+
+ Only add the user supplied CFLAGS after running any autoconf tests.
+ * configure.ac: Only add the user supplied CFLAGS after running any
+ autoconf tests.
+
+ gpg: Suppress a warning.
+ * dirmngr/dns-stuff.c (enable_dns_tormode): Reference new_circuit to
+ avoid a warning when ADNS is not available.
+
+ gpg: Remove dead code.
+ * kbx/keybox-defs.h (struct keybox_found_s): Remove unused fields
+ offset and n_packets.
+
+ gpg: Display the key that is invalid, not the search description.
+ * g10/getkey.c (parse_def_secret_key): Display the key that is
+ invalid, not the search description.
+
+ gpg: Mark more options as coming from the config file (when this holds)
+ * g10/gpg.c (main): When --default-key or --encrypt-to-default-key is
+ taken from the config file, note this.
+
+ gpg: Use enums instead of defines.
+ * g10/keydb.h (PK_LIST_ENCRYPT_TO): Change from a macro to an enum.
+ (PK_LIST_HIDDEN): Likewise.
+ (PK_LIST_CONFIG): Likewise.
+ (PK_LIST_SHIFT): Likewise.n
+
+2015-12-21 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+ g10: clean up of headers for card.
+ * g10/main.h (save_unprotected_key_to_card): Remove.
+ * g10/options.h (ctapi_driver, pcsc_driver, disable_ccid): Remove.
+
+2015-12-21 Werner Koch <wk at gnupg.org>
+
+ common: New file fwddecl.h.
+ * common/util.h (server_control_s, ctrl_t): Move to ...
+ * common/fwddecl.h: New file.
+ * common/call-gpg.h: Replace typedef by fwddecl.h. Change include
+ protection macro name.
+ * common/Makefile.am (common_sources): Add fwddecl.h.
+
+2015-12-18 Werner Koch <wk at gnupg.org>
+
+ build: Add required macro for pkg-config.
+ * configure.ac (PKG_PROG_PKG_CONFIG): New.
+
+2015-12-18 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Remove deprecated internal functions.
+ * g10/keygen.c (do_ask_passphrase, generate_raw_key)
+ (gen_card_key_with_backup, save_unprotected_key_to_card): Remove.
+
+ g10: Fix a regression for generating card key with backup.
+ * g10/main.h (receive_seckey_from_agent): Declare.
+ * g10/keygen.c (card_write_key_to_backup_file): New.
+ (card_store_key_with_backup): New.
+ (do_generate_keypair): Create a key on host for encryption key when
+ backup is requested. Then, call card_store_key_with_backup.
+
+2015-12-17 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: factor out a function for secret key retrieval.
+ * g10/export.c (receive_seckey_from_agent): New.
+ (do_export_stream): Use it.
+
+2015-12-16 Neal H. Walfield <neal at g10code.com>
+
+ gpg: When checking for ambiguous keys, ignore invalid keys.
+ * g10/gpg.c (check_user_ids): When checking for ambiguous keys, ignore
+ disabled, revoked and expired keys (if appropriate for the provided
+ option).
+
+2015-12-15 Werner Koch <wk at gnupg.org>
+
+ common: Use default_errsource for call-gpg and exectool.
+ * common/call-gpg.c (my_error_from_syserror, my_error_from_errno): New.
+ Use these wrappers.
+ * common/exectool.c (my_error_from_syserror): New. Use these
+ wrappers.
+
+ gpg: Reduce number of strings to translate.
+ * g10/getkey.c (parse_def_secret_key): Do not make debug messages
+ translatable. Make use of print_reported_error.
+
+ gpg: New function to printed a detailed error code.
+ * g10/misc.c (print_reported_error): New.
+
+2015-12-15 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Improve the keyblock cache's transparency.
+ * kbx/keybox-search.c (keybox_seek): New function.
+ * g10/keydb.c (keydb_search): When reading from the cache, seek to
+ just after the cached record.
+
+ gpg: Improve the keyblock cache's transparency.
+ * kbx/keybox-search.c (keybox_offset): New function.
+ * g10/keydb.c (struct keyblock_cache): Add fields resource and offset.
+ (keyblock_cache_clear): Reset HD->KEYBLOCK_CACHE.RESOURCE and
+ HD->KEYBLOCK_CACHE.OFFSET.
+ (keydb_search): Don't use the cached result if it comes before the
+ current file position. When caching an entry, also record the
+ position at which it was found.
+
+ gpg: Use more descriptive names.
+ * g10/keyring.c (KR_NAME): Rename this...
+ (KR_RESOURCE): ... to this. Update users.
+ (struct keyring_name): Rename this...
+ (struct keyring_resource): ... to this. Update users.
+ (struct off_item): Rename this...
+ (struct key_present): ... to this. Update users.
+ (OffsetHashTable): Rename this...
+ (key_present_hash_t): ... to this. Update users.
+ (kr_offtbl): Rename this...
+ (key_present_hash): ... to this. Update users.
+ (kr_offtbl_ready): Rename this...
+ (key_present_hash_ready): ... to this. Update users.
+ (KEY_PRESENT_HASH_BUCKETS): New define. Replace use of literals
+ with this.
+ (new_offset_item): Rename this...
+ (key_present_value_new): ... to this. Update users.
+ (release_offset_items): Drop dead code.
+ (new_offset_hash_table): Rename this...
+ (key_present_hash_new): ... to this. Update users.
+ (release_offset_hash_table): Drop dead code.
+ (lookup_offset_hash_table): Rename this...
+ (key_present_hash_lookup): ... to this. Update users.
+ (update_offset_hash_table): Rename this...
+ (key_present_hash_update): ... to this. Drop unused parameter off.
+ Update users.
+ (update_offset_hash_table_from_kb): Rename this...
+ (key_present_hash_update_from_kb): ... to this. Drop unused parameter
+ off. Update users.
+
+2015-12-15 NIIBE Yutaka <gniibe at fsij.org>
+
+ sm: Handle gcry_pk_encrypt return value.
+ * sm/encrypt.c (encrypt_dek): Don't ignore failure of gcry_pk_encrypt.
+
+2015-12-14 Werner Koch <wk at gnupg.org>
+
+ common: Change license of isascii.c to all-premissive,
+ * common/isascii.c: Change.
+
+ common: Change license of some modules to LGPLv3+/GPLv2+.
+ * common/status.c: Change from GPLv3 to LGPLv3+/GPLv2+.
+ * common/status.h: Ditto.
+ * common/yesno.c: Ditto.
+ * common/common-defs.h: Ditto.
+ * common/gettime.h: Ditto.
+ * common/keyserver.h: Ditto.
+
+ common: Change license for exectool to LGPLv3+/GPLv2+.
+ * common/exectool.c, common/exectool.h: Change license.
+
+ common: Rename sh-exectool to exectool.
+ * common/sh-exectool.c: Rename to exectool.c.
+ * common/sh-exectool.h: Rename to exectool.h.
+ * common/Makefile.am (common_sources): Adjust for rename.
+ * common/exectool.c (sh_exec_tool_stream): Rename to
+ gnupg_exec-tool-stream.
+ (sh_exec_tool): Rename to gnupg_exec_tool.
+ * tools/gpgtar-create.c (gpgtar_create): Adjust for changes.
+ * tools/gpgtar-extract.c: Adjust for changes.
+ * tools/gpgtar-list.c: Adjust for changes.
+
+2015-12-14 Damien Goutte-Gattat <dgouttegattat at incenp.org>
+
+ gpg: Print ownertrust in TOFU+PGP trust model.
+ * g10/keyedit.c: Print ownertrust in TOFU+PGP trust model.
+
+2015-12-14 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix --default-key checks.
+ * g10/getkey.c (parse_def_secret_key): Don't just check if a secret
+ key is available for the public key, also consider subkeys. Also
+ check that the key has the signing capability, is not revoked, is not
+ expired and is not disabled. Print a warning if there was a least one
+ value passed to --default-key and all were ignored.
+
+2015-12-14 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix regression for generating RSA keys on card.
+ * scd/app-openpgp.c (do_genkey): Strip leading zeros for fingerprint
+ computation.
+
+2015-12-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Use a regular type instead of a void* for import stats.
+ * g10/import.c (struct stats_s): Rename to import_stats_s. Change all
+ users.
+ * g10/main.h (import_stats_t): New. Change fucntions to use this
+ instead of a void pointer.
+
+ Remove replacements for libgpg-error < 1.21.
+ * common/util.h: Remove replacement macros for libgpg-error<1.21.
+ * common/types.h: Ditto.
+ * common/mischelp.h: Ditto.
+ * common/t-mapstrings.c: Include t-support.h before stringhelp.h
+ * common/t-stringhelp.c: Ditto.
+ * common/t-support.h: Always include gpg-error.h.
+ * kbx/keybox-search.c: Do not include stringhelp.h so that keybox-defs
+ comes first.
+
+2015-12-11 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix buffer overflow.
+ * g10/keydb.c (keydb_search_desc_dump): Fix buffer overflow.
+
+2015-12-11 Justus Winter <justus at g10code.com>
+
+ agent: Improve error handling.
+ * agent/pksign.c (agent_pksign_do): Improve error handling.
+
+ Fix required libgpg-error version.
+ * configure.ac (NEED_GPG_ERROR_VERSION): We need version 1.21 for the
+ poll interface.
+
+2015-12-11 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Don't error out if a key occurs multiple times in the keyring.
+ * g10/gpg.c (check_user_ids): Don't error out if a key occurs multiple
+ times in the keyring. Instead, print a warning. When printing out
+ fingerprint prints, use format_hexfingerprint to format them.
+
+2015-12-10 Daniel Hoffend <dh at dotlan.net>
+
+ scd: Fix removal of unplugged usb readers on Windows.
+ * scd/apdu.c (pcsc_error_to_sw): map PCSC_E_NO_SERVICE and
+ PCSC_E_SERVICE_STOPPED to the internal SW_HOST_NO_READER error code.
+
+2015-12-07 Justus Winter <justus at g10code.com>
+
+ tests: Add some more gpgtar tests.
+ * tests/openpgp/gpgtar.test: Add more tests.
+
+ dirmngr: Initialize http status code.
+ * dirmngr/ks-action.c (ks_action_search): Initialize 'http_status' as
+ it is unused if LDAP is used to search for keys.
+
+2015-12-04 Daiki Ueno <ueno at gnu.org>
+
+ gpg: Write ERROR status on delete-key cancellation.
+ * g10/delkey.c (do_delete_key): Write ERROR status code with the error
+ location "delete_key.secret", when the user cancelled the operation on
+ Pinentry.
+
+2015-12-04 Justus Winter <justus at g10code.com>
+
+ dirmngr: Stricter handling of http error codes.
+ * dirmngr/ks-action.c (ks_action_search): Only retry if the keyserver
+ responded with a '404 Not Found'.
+ * dirmngr/ks-engine-hkp.c (send_request): Return http status code.
+ (ks_hkp_search): Likewise.
+ (ks_hkp_{get,put}): Adapt call to 'send_request'.
+ * dirmngr/ks-engine.h (ks_hkp_search): Update prototype.
+
+ dirmngr: Really search all keyservers for patterns.
+ * dirmngr/ks-action.c (ks_action_search): Search all configured
+ keyservers for the given patterns.
+
+ GnuPG-bug-id: 1038
+
+ dirmngr: Handle http status '501 Not Implemented'.
+ * dirmngr/ks-engine-hkp.c (send_request): Handle status 501 and return
+ GPG_ERR_NOT_IMPLEMENTED.
+
+ GnuPG-bug-id: 1221
+
+ tools/gpgtar: Implement symmetric encryption.
+ * tests/openpgp/gpgtar.test: Add test case.
+ * tools/gpgtar-create.c (gpgtar_create): Pass '--symmetric' flag to
+ gpg.
+ * tools/gpgtar.c (parse_arguments): We do handle the argument now.
+
+ tools/gpgtar: Implement signing.
+ * tests/openpgp/gpgtar.test: Test signing.
+ * tools/gpgtar-create.c (gpgtar_create): Add 'sign' option, add the
+ appropriate gpg arguments to implement signing and selecting the local
+ user.
+ * tools/gpgtar.c (parse_options): We do handle '--local-user' now.
+ (main): Handle signing, encrypting, and doing both when creating an
+ archive.
+ * tools/gpgtar.h (gpgtar_create): Update prototype.
+
+ tools/gpgtar: Use the new exectool helper.
+ * tools/Makefile.am: gpgtar now requires neither npth nor libassuan.
+ * tools/gpgtar-create.c (gpgtar_create): Use the new 'sh-exectool'
+ helper.
+ * tools/gpgtar-extract.c (gpgtar_extract): Likewise.
+ * tools/gpgtar-list.c (gpgtar_list): Likewise.
+ * tools/gpgtar.c (main): Set default gpg program. Drop the
+ initialization of npth and libassuan.
+
+ common: Add a stream interface to 'sh-exectool'.
+ * common/sh-exectool.c (struct copy_buffer): Add infrastructure for
+ copying between streams.
+ (copy_buffer_{init,shred,do_copy,flush}): New functions.
+ (sh_exec_tool_stream): Rework 'sh_exec_tool' to operate on streams.
+ (nop_free): New function.
+ (sh_exec_tool): Express this in terms of 'sh_exec_tool_stream'.
+ * common/sh-exectool.h (sh_exec_tool_stream): New prototype.
+
+ common: Add header file and build the new code.
+ * common/Makefile.am (common_sources): Add new files.
+ * common/sh-exectool.h: New file.
+
+2015-12-04 Werner Koch <wk at gnupg.org>
+
+ common: Add code to execute a helper.
+ * common/sh-exectool.c: New file.
+
+ Release 2.1.10.
+
+2015-12-04 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Japanese translation.
+
+2015-12-04 Werner Koch <wk at gnupg.org>
+
+ speedo,w32: Improve installer.
+ * build-aux/speedo/w32/inst.nsi (SEC_gnupg): Install dirmngr.conf and
+ distsigkey.gpg.
+ (un.gnupglast): Stop dirmngr.
+
+ gpg: Do not pre-check keys given on the command line.
+ * g10/keydb.h (PK_LIST_ENCRYPT_TO, PK_LIST_HIDDEN, PK_LIST_CONFIG)
+ (PK_LIST_SHIFT): New.
+ * g10/pkclist.c (build_pk_list): Use them here.
+ * g10/gpg.c (check_user_ids, main): Ditto.
+
+ * g10/gpg.c (main): Set PK_LIST_CONFIG for REMUSR and LOCUSR.
+ (check_user_ids): Skip check for command line specified options.
+
+ dirmngr: Add command to print the resolver version.
+ * dirmngr/server.c (cmd_getinfo): Add sub-command "dnsinfo".
+
+ gpg: Allow "help" as value for --tofu-policy.
+ * g10/gpg.c (parse_tofu_policy): Add keyword "help".
+ (parse_tofu_db_format): Ditto.
+
+ Do not translate messages printed with log_debug.
+ * common/asshelp.c (start_new_gpg_agent): Do not i18n string.
+ (start_new_dirmngr): Ditto.
+ * g10/mainproc.c (proc_encrypted): Ditto. Print only if debug is
+ enabled.
+
+2015-12-04 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix for removing the prefix.
+ * scd/app-openopg.c (do_decipher): Fix the condition.
+
+ scd: Simplify saving application context.
+ * scd/app.c (lock_table): Remove LAST_APP field.
+ (lock_reader, app_dump_state, application_notify_card_reset)
+ (release_application): Follow the change.
+ (check_conflict): New.
+ (check_application_conflict): Lock the slot and call check_conflict.
+ (select_application): Call check_conflict and not use LAST_APP.
+
+ scd: More fix for Curve25519 prefix handling.
+ * scd/app-openpgp.c (do_decipher): Handle trancated cipher text.
+ Also fix xfree bug introduced.
+
+2015-12-03 Werner Koch <wk at gnupg.org>
+
+ scd: Another fix for Curve25519 prefix handling.
+ * scd/app-openpgp.c (do_decipher): Check 0x02 also for 16+1 byte long
+ INDATA.
+ (do_decipher): Fix integer arithmetic in void pointer.
+ (do_decipher): Add missing memcpy.
+
+ build: Avoid dependecy problems in "make distcheck".
+ * doc/Makefile.am (gnupg.texi): Depend on defs.inc.
+
+ build: Change how caller provided CFLAGS are used by configure.
+ * configure.ac: Append instead of prepend caller provided CFLAGS.
+
+ gpg: Add variant of 'key "%s" not found: %s' error message.
+ * g10/gpg.c (check_user_ids): Change error message.
+ * g10/delkey.c (do_delete_key): Ditto.
+
+ gpg: Make keyidlist more robust in case of errors.
+ * g10/keyserver.c (keyidlist): Clear *KLIST on error.
+
+ gpg: Take care of keydb_new returning NULL.
+ * g10/keydb.c (keydb_new): Print an error message if needed. Also use
+ xtrycalloc because we return an error anyway.
+ * g10/delkey.c (do_delete_key): Handle error retruned by keydb_new.
+ * g10/export.c (do_export_stream): Ditto.
+ * g10/getkey.c (get_pubkey): Ditto.
+ (get_pubkey_fast): Ditto.
+ (get_pubkeyblock): Ditto.
+ (get_seckey): Ditto.
+ (key_byname): Ditto.
+ (get_pubkey_byfprint): Ditto.
+ (get_pubkey_byfprint_fast): Ditto.
+ (parse_def_secret_key): Ditto.
+ (have_secret_key_with_kid): Ditto.
+ * g10/import.c (import_one): Ditto.
+ (import_revoke_cert): Ditto.
+ * g10/keyedit.c (keyedit_quick_adduid): Ditto.
+ * g10/keygen.c (quick_generate_keypair): Ditto.
+ (do_generate_keypair): Ditto.
+ * g10/trustdb.c (validate_keys): Ditto.
+ * g10/keyserver.c (keyidlist): Ditto.
+ * g10/revoke.c (gen_desig_revoke): Ditto.
+ (gen_revoke): Ditto.
+ * g10/gpg.c (check_user_ids): Ditto.
+ (main): Do not print an error message for keydb_new error.
+ * g10/keylist.c (list_all): Use actual error code returned by
+ keydb_new.
+
+ * g10/t-keydb-get-keyblock.c (do_test): Abort on keydb_new error.
+ * g10/t-keydb.c (do_test): Ditto.
+
+ * g10/keyring.c (keyring_new): Actually return an error so that the
+ existing keydb_new error checking makes sense for a keyring resource.
+ (keyring_rebuild_cache): Take care of keyring_new returning an error.
+
+ gpg: Change some error messages.
+ * g10/getkey.c (parse_def_secret_key): Change error message. Replace
+ log_debug by log_info.
+ * g10/gpg.c (check_user_ids): Make function static. Change error
+ messages.
+ (main): Change error messages.
+ * g10/revoke.c (gen_revoke): Ditto.
+
+2015-12-03 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix "Conflicting usage" bug.
+ * scd/apdu.c (apdu_close_reader): Call CLOSE_READER method even if we
+ got an error from apdu_disconnect.
+ * scd/app-common.h (no_reuse): Remove.
+ * scd/app.c (application_notify_card_reset): Deallocate APP here.
+ (select_application, release_application): Don't use NO_REUSE.
+
+ scd: Fix for Curve25519 prefix handling.
+ * scd/app-openpgp.c (do_decipher): More condition for AES decipher.
+ Handle the prefix in cipher text. Always add the prefix in result.
+
+2015-12-03 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Use the matching key if the search description is exact.
+ * g10/gpg.c (check_user_ids): If the search description is for an
+ exact match (a keyid or fingerprint that ends in '!'), then use the
+ matching key, not the primary key.
+ * tests/openpgp/Makefile.am (TESTS): Add use-exact-key.test.
+ (priv_keys): Add privkeys/00FE67F28A52A8AA08FFAED20AF832DA916D1985.asc,
+ privkeys/1DF48228FEFF3EC2481B106E0ACA8C465C662CC5.asc,
+ privkeys/A2832820DC9F40751BDCD375BB0945BA33EC6B4C.asc,
+ privkeys/ADE710D74409777B7729A7653373D820F67892E0.asc and
+ privkeys/CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc.
+ (sample_keys): Add
+ samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc.
+ * tests/openpgp/privkeys/00FE67F28A52A8AA08FFAED20AF832DA916D1985.asc:
+ New file.
+ * tests/openpgp/privkeys/1DF48228FEFF3EC2481B106E0ACA8C465C662CC5.asc:
+ New file.
+ * tests/openpgp/privkeys/A2832820DC9F40751BDCD375BB0945BA33EC6B4C.asc:
+ New file.
+ * tests/openpgp/privkeys/ADE710D74409777B7729A7653373D820F67892E0.asc:
+ New file.
+ * tests/openpgp/privkeys/CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc:
+ New file.
+ * tests/openpgp/samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc:
+ New file.
+ * tests/openpgp/use-exact-key.test: New file.
+ * tests/openpgp/version.test: Install the new private keys.
+
+2015-12-02 Werner Koch <wk at gnupg.org>
+
+ build: Require at least Libassuan 2.4.1.
+ * configure.ac (NEED_LIBASSUAN_VERSION): Set to 2.4.1.
+ * agent/gpg-agent.c (create_server_socket): Remove check for
+ libassuan >= 2.3.0 and >= 2.1.4.
+ (main): Remove check for libassuan >= 2.1.4.
+ * scd/scdaemon.c (create_server_socket): Remove check for
+ libassuan >= 2.1.4.
+ * dirmngr/dirmngr.c (set_tor_mode): Remove check for
+ libassuan >= 2.3.0.
+ * dirmngr/http.c (http_raw_connect, send_request): Remove checks for
+ libassuan >= 2.3.0.
+
+2015-12-02 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Improve documentation.
+ * g10/tofu.c (initdb): Improve documentation.
+
+ gpg: Fix type mismatch resulting in a buffer overflow.
+ * g10/tofu.c (record_binding): Change policy_old's type from an enum
+ tofu_policy to a long: this variable is passed by reference and a long
+ is expected.
+
+2015-12-02 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Switch to an onion address if Tor is running.
+ * dirmngr/dirmngr.h (opt): Turn field 'keyserver' into an strlist.
+ * dirmngr/dirmngr.c (parse_rereadable_options): Allow multiple
+ --keyserver options.
+ * dirmngr/server.c (server_local_s): Add field 'tor_state'.
+ (release_uri_item_list): New.
+ (release_ctrl_keyservers): Use it.
+ (start_command_handler): Release list of keyservers.
+ (is_tor_running): New.
+ (cmd_getinfo): Re-implement "tor" subcommand using new fucntion.
+ (ensure_keyserver): Rewrite.
+ * g10/dirmngr-conf.skel: Add two keyserver options.
+
+ http: Enhance parser to detect .onion addresses.
+ * dirmngr/http.h (parsed_uri_s): Add flag 'onion'.
+ * dirmngr/http.c (do_parse_uri): Set that flag.
+ * dirmngr/t-http.c (main): Print flags.
+
+2015-12-02 Neal H. Walfield <neal at g10code.com>
+
+ common,gpg: Fix processing of search descriptions ending in '!'.
+ * g10/gpg.c (check_user_ids): If the search description describes a
+ keyid or fingerprint and ends in a '!', include the '!' in the
+ rewritten description.
+ * common/userids.c (classify_user_id): Accept keyids and fingerprints
+ ending in '!'.
+
+2015-12-01 Justus Winter <justus at g10code.com>
+
+ dirmngr: Improve error handling.
+ * dirmngr/dns-stuff.c (getsrv): Avoid looking at 'header' before
+ checking for errors, but silently ignore errors when looking up SRV
+ records.
+
+2015-12-01 Werner Koch <wk at gnupg.org>
+
+ build: Let configure show the the status of Tor support.
+ * configure.ac (show_tor_support): New
+
+2015-11-30 Werner Koch <wk at gnupg.org>
+
+ doc: Make make distcheck work again.
+ * doc/Makefile.am (DISTCLEANFILES): Add gpgkey2ssh.1
+
+ yat2m: Add keyword @url.
+ * doc/yat2m.c (proc_texi_cmd): Add keyword @url.
+
+ doc: Build man pages with the same date as the info files.
+ * doc/Makefile.am (yat2m-stamp): Use option --date.
+
+ yat2m: New option --date.
+ * doc/yat2m.c (opt_date): new.
+ (isodatestring): Use it if set.
+ (main): New option --date.
+
+2015-11-27 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid extra translation strings.
+ * g10/keyedit.c (menu_expire): Use only one prompt.
+
+ kbx: Include gpg-error prior to mischelp.h.
+ * kbx/keybox-init.c: Change order of includes.
+
+ gpg,w32: Fix a format string error.
+ * g10/keyring.c (keyring_search): Fix format string for off_t.
+
+ Silence compiler warnings related to not using assuan_fd_t.
+ * common/call-gpg.c (start_gpg): Use assuan_fd_t. Note that the
+ declaration was already fixed by a previous change.
+ * dirmngr/server.c (cmd_getinfo): Use assuan_fd_t.
+
+ Avoid incompatible pointer assignment warnings on Windows.
+ * common/logging.c (fun_writer): Use gpgrt_ssize_t instead of ssize_t.
+ * dirmngr/server.c (data_line_cookie_write): Ditto.
+ * sm/certdump.c (format_name_writer): Ditto.
+ * sm/server.c (data_line_cookie_write): Ditto.
+ * dirmngr/http.c (cookie_read, cookie_write): Ditto.
+
+ dirmngr: Avoid a declarations after statements.
+ * tools/gpgtar.c (parse_arguments): Use a block for a local varibale
+ definition.
+
+ dirmngr: Avoid casting away a const from an char**.
+ * dirmngr/ldap.c (start_cert_fetch_ldap): Do not use pointers from
+ global variables.
+
+ dirmngr: Allow testing for a running Tor via "getinfo tor".
+ * dirmngr/server.c (cmd_getinfo): Print an S line if Tor is not
+ running.
+
+2015-11-26 Werner Koch <wk at gnupg.org>
+
+ g13: Fix commit 1a045b13.
+ * g13/g13.c (main): Use existsing function.
+
+ common: Fix off-by-one access in the new format_text.
+ * common/stringhelp.c (format_text): Use existsing fucntion to trim
+ trailing spaces. Fix off-by-one access.
+
+ dirmngr: Improve output of "getinfo tor".
+ * dirmngr/server.c (cmd_getinfo): Print a message along with OK.
+
+ dirmngr: Let Libassuan employ nPth wrappers for connect.
+ * dirmngr/http.c (my_unprotect, my_protect): Remove.
+ (connect_server): Do not use these wrappers.
+
+2015-11-26 Justus Winter <justus at g10code.com>
+
+ tools/gpgtar: Add '--dry-run'.
+ * tools/gpgtar-extract.c (extract_{regular,directory}): Honor
+ '--dry-run'.
+ * tools/gpgtar.c (enum cmd_and_opt_values): New value.
+ (opts): Add '--dry-run'.
+ (parse_arguments): Handle '--dry-run'.
+ * tools/gpgtar.h (opt): Add field 'dry_run'.
+
+ tools/gpgtar: Handle '--gpg-args'.
+ * tools/gpgtar-create.c (gpgtar_create): Use given arguments.
+ * tools/gpgtar-extract.c (gpgtar_extract): Likewise.
+ * tools/gpgtar-list.c (gpgtar_list): Likewise.
+ * tools/gpgtar.c (enum cmd_and_opt_values): New value.
+ (opts): Add 'gpg-args'.
+ (parse_arguments): Handle arguments.
+ * tools/gpgtar.h (opt): Add field 'gpg_arguments'.
+ * tests/openpgp/gpgtar.test: Simplify accordingly.
+
+ common: Make the GPG arguments configurable in call-gpg.
+ * common/call-gpg.c (start_gpg): Add parameter 'gpg_arguments'.
+ (_gpg_encrypt, gpg_encrypt_blob, gpg_encrypt_stream): Likewise.
+ (_gpg_decrypt, gpg_decrypt_blob, gpg_decrypt_stream): Likewise.
+ * common/call-gpg.h: Adapt prototypes.
+ * g13/create.c (encrypt_keyblob): Adapt callsite.
+ * g13/g13-common.h (opt): Add field 'gpg_arguments'.
+ * g13/g13.c (main): Construct default arguments.
+ * g13/mount.c (decrypt_keyblob): Adapt callsite.
+ * tools/gpgtar-create.c (gpgtar_create): Likewise.
+ * tools/gpgtar-extract.c (gpgtar_extract): Likewise.
+ * tools/gpgtar-list.c (gpgtar_list): Likewise.
+
+ tools/gpgtar: Handle '--tar-args' for compatibility with gpg-zip.
+ * tools/gpgtar.c (enum cmd_and_opt_values): New value.
+ (opts): Add new group for tar options, rearrange a little, add
+ '--tar-args'.
+ (tar_opts): New variable.
+ (shell_parse_stringlist): New function.
+ (shell_parse_argv): Likewise.
+ (parse_arguments): Add option argument, handle '--tar-args'.
+ (main): Fix invokation of 'parse_arguments'.
+ * tests/openpgp/gpgtar.test: Simplify decryption.
+
+ tools/gpgtar: Rework argument parsing.
+ * tools/gpgtar.c (main): Move argument parsing into its own function.
+
+2015-11-25 Justus Winter <justus at g10code.com>
+
+ tests: Add tests for gpgtar and gpg-zip.
+ * tests/openpgp/Makefile.am (TESTS): Add new file.
+ * tests/openpgp/gpgtar.test: New file.
+
+ tools/gpgtar: Handle '--directory' argument.
+ * tools/gpgtar-extract.c (gpgtar_extract): Only generate a directory
+ name if none is given via arguments.
+ * tools/gpgtar.c (enum cmd_and_opt_values): New constant.
+ (opts): Add argument.
+ (main): Parse argument.
+ * tools/gpgtar.h (opt): New field 'directory'.
+
+ tools/gpgtar: Handle '--gpg' argument.
+ * tools/gpgtar-create.c (gpgtar_create): Use given gpg program.
+ * tools/gpgtar-extract.c (gpgtar_extract): Likewise.
+ * tools/gpgtar-list.c (gpgtar_list): Likewise.
+ * tools/gpgtar.c (enum cmd_and_opt_values): New constant.
+ (opts): Add argument.
+ (main): Handle argument.
+ * tools/gpgtar.h (opt): Add field 'gpg_program'.
+
+ tools/gpgtar: Improve error handling.
+ * tools/gpgtar-create.c (gpgtar_create): Return an error code, fix
+ error handling.
+ * tools/gpgtar-extract.c (gpgtar_extract): Likewise.
+ * tools/gpgtar-list.c (read_header): Return an error code.
+ (gpgtar_list): Return an error code, fix error handling.
+ (gpgtar_read_header): Return an error code.
+ * tools/gpgtar.c: Add missing include.
+ (main): Print an generic error message if a command failed and no
+ error has been printed yet.
+ * tools/gpgtar.h (gpgtar_{create,extract,list,read_header}): Fix the
+ prototypes accordingly.
+
+ tools: Add encryption and decryption support to gpgtar.
+ * tools/Makefile.am: Amend CFLAGS and LDADD.
+ * tools/gpgtar-create.c (gpgtar_create): Add encrypt flag and encrypt
+ stream if requested.
+ * tools/gpgtar-extract.c (gpgtar_extract): Likewise for decryption.
+ * tools/gpgtar-list.c (gpgtar_list): Likewise.
+ * tools/gpgtar.c (main): Initialize npth and assuan. Parse recipient
+ and local user, and note which flags are currently ignored. Adapt
+ calls to gpgtar_list and friends.
+ (tar_and_encrypt): Drop stub function and prototype.
+ (decrypt_and_untar): Likewise.
+ (decrypt_and_list): Likewise.
+ * tools/gpgtar.h (gpgtar_{create,extract,list}): Add encryption or
+ decryption argument.
+
+ common: Add stream interface to call-pgp.
+ * common/call-gpg.c (struct writer_thread_parms): Add field 'stream'.
+ (writer_thread_main): Support reading from a stream.
+ (start_writer): Add stream argument.
+ (struct reader_thread_parms): Add field 'stream'.
+ (reader_thread_main): Support writing to a stream.
+ (start_reader): Add stream argument.
+ (_gpg_encrypt): Add stream api.
+ (gpg_encrypt_blob): Adapt accordingly.
+ (gpg_encrypt_stream): New function.
+ (_gpg_decrypt): Add stream api.
+ (gpg_decrypt_blob): Adapt accordingly.
+ (gpg_decrypt_stream): New function.
+ * common/call-gpg.h (gpg_encrypt_stream): New prototype.
+ (gpg_decrypt_stream): Likewise.
+
+ common: Refactor the call-gpg code.
+ * common/call-gpg.c (gpg_{en,de}crypt_blob): Move most of the code
+ into two new functions, _gpg_encrypt and _gpg_decrypt.
+
+ g13: Move 'call-gpg.c' to common.
+ * common/Makefile.am (common_sources): Add files.
+ * g13/call-gpg.c: Move to 'common' and adapt slightly. Add a
+ parameter to let callees override the gpg program to execute.
+ * g13/call-gpg.h: Likewise.
+ * g13/Makefile.am (g13_SOURCES): Drop files.
+ * g13/create.c (encrypt_keyblob): Hand in the gpg program to execute.
+ * g13/mount.c (decrypt_keyblob): Likewise.
+
+2015-11-24 Neal H. Walfield <neal at g10code.com>
+
+ gpg: When comparing keyids, use the keyid, not the fingerprint's suffix.
+ * g10/keyedit.c (menu_select_key): Use spacep and hexdigitp instead of
+ inline tests. Don't compare P to the suffix of the fingerprint. If P
+ appears to be a keyid, do an exact compare against the keyid. If it
+ appears to be a fingerprint, do an exact compare against the
+ fingerprint.
+
+2015-11-23 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Reflow long texts.
+ * common/stringhelp.c (format_text): New function.
+ * common/t-stringhelp.c (stresc): New function.
+ (test_format_text): New function. Test format_text.
+ * g10/tofu.c (get_trust): Use format_text to reflow long texts.
+ (show_statistics): Likewise.
+
+ common: Extend utf8_charcount to include the string's length.
+ * common/stringhelp.c (utf8_charcount): Take additional parameter,
+ len. Process at most LEN bytes.
+
+2015-11-23 Justus Winter <justus at g10code.com>
+
+ dirmngr: Fix http lookups when libadns is used.
+ * dirmngr/dns-stuff.c (resolve_name_adns): Fill in the port.
+
+ dirmngr: Fix SRV record lookups when using the system resolver.
+ * dirmngr/dns-stuff.c (getsrv): Fix error handling.
+
+ dirmngr: Honor ports specified in SRV records.
+ * dirmngr/ks-engine-hkp.c (struct hostinfo_s): New field 'port'.
+ (create_new_hostinfo): Initialize 'port'.
+ (add_host): Add host parameter and update the hosttable entry.
+ (map_host): Return port if known, adjust calls to 'add_host'.
+ (make_host_part): Let 'map_host' specify the port if known.
+
+ dirmngr: Support hkp server pools using SRV records.
+ * dirmngr/ks-engine-hkp.c (map_host): Handle SRV records.
+
+ dirmngr: Refactor 'map_host'.
+ * dirmngr/ks-engine-hkp.c (add_host): New function.
+ (map_host): Use the new function.
+
+ dirmngr: Fix pool detection.
+ * dirmngr/ks-engine-hkp (arecords_is_pool): Fix counting IP addresses.
+
+ dirmngr: Refactor 'map_host'.
+ * dirmngr/ks-engine-hkp.c (arecords_is_pool): New function.
+ (map_host): Use the new function.
+
+ dirmngr: Start dirmngr on demand.
+ * common/asshelp.h: Include 'util.h'.
+ * dirmngr/dirmngr-client.c (main): Use 'start_new_dirmngr' to connect
+ to the dirmngr.
+ (start_dirmngr): Drop now unused declaration and function.
+
+2015-11-23 Neal H. Walfield <neal at g10code.com>
+
+ gpg: If sqlite is not available, don't build things depending on it.
+ * configure.ac: Define the automake conditional SQLITE3.
+ * tests/openpgp/Makefile.am (TESTS): Move the sqlite3 dependent tests
+ to...
+ (sqlite3_dependent_tests): ... this new variable. If SQLITE3 is not
+ defined, then clear this variable.
+
+ gpg: Allow updating the expiration time of multiple subkeys at once.
+ * g10/keyedit.c (menu_expire): Allow updating the expiration time of
+ multiple subkeys at once.
+
+ gpg: Don't crash if key is not passed an argument.
+ * g10/keyedit.c (menu_select_key): Don't crash if P is NULL.
+
+2015-11-20 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fail if the search description passed to --gen-revoke is ambiguous.
+ * g10/revoke.c (gen_revoke): Error out if the search description is
+ ambiguous.
+
+ gpg: Refactor print_seckey_info.
+ * g10/keylist.c (print_seckey_info): Break formatting functionality
+ into...
+ (format_seckey_info): ... this new function.
+
+ gpg: Improve an error message.
+ * g10/revoke.c (gen_revoke): Provide a more descriptive error message
+ if searching for a key fails.
+
+2015-11-19 Justus Winter <justus at g10code.com>
+
+ dirmngr: Improve error handling.
+ * dirmngr/crlcache.c (crl_cache_cert_isvalid): Add missing break.
+
+ dirmngr: Fix memory leak.
+ * dirmngr/ldap.c (start_cert_fetch_ldap): Avoid leaking all malloc'ed
+ arguments.
+
+ agent: Improve error handling.
+ * agent/trustlist.c (istrusted_internal): Initialize 'err'.
+
+ common: Avoid undefined behavior.
+ * common/iobuf.c (iobuf_esopen): Initialize 'len' as 'file_es_filter'
+ will make use of it.
+
+ g10: Avoid undefined behavior.
+ * g10/trust.c (clean_one_uid): Avoid a computation involving an
+ uninitialized value.
+
+ scd: Improve error handling.
+ * scd/app-openpgp.c (get_public_key): Improve error handling.
+
+2015-11-18 Justus Winter <justus at g10code.com>
+
+ dirmngr: Gracefully handle premature termination of TLS streams.
+ * dirmngr/http.c (close_tls_session): New function.
+ (session_unref): Use the new function to close the TLS stream.
+ (cookie_read): If the stream terminated prematurely, close it and
+ return a short read.
+
+2015-11-17 Neal H. Walfield <neal at g10code.com>
+ Michael Mönch <michael.moench at marktjagd.de>
+
+ tools: Fix option parsing for gpg-zip.
+ * tools/gpg-zip.in: Correctly set GPG when --gpg is specified.
+ Correctly set TAR when --tar is specified. Pass TAR_ARGS to tar.
+
+2015-11-17 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Allow selecting subkeys using a keyid.
+ * g10/keyedit.c (menu_select_key): Take an additional argument, p.
+ Update callers. If P is a hex string, then assume that P is a key id
+ or fingerprint and select subkeys with matching key ids or
+ fingerprints.
+ * doc/gpg.texi: Update documentation for the key subcommand.
+
+2015-11-17 Justus Winter <justus at g10code.com>
+
+ dirmngr: Fix specifying keyservers by IP address.
+ * dirmngr/ks-engine-hkp.c (map_host): Update the original 'hosttable'
+ entry instead of creating another one.
+
+2015-11-17 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Change keydb_search to not return legacy keys.
+ * g10/keyring.c (keyring_search): Take new argument, ignore_legacy.
+ If set, skip any legacy keys. Update callers.
+ * g10/keydb.c (keydb_search): Skip any legacy keys.
+ (keydb_search_first): Don't skip legacy keys. Treat them
+ as an error.
+ (keydb_search_next): Likewise.
+ (keydb_search_fpr): Likewise.
+ * g10/export.c (do_export_stream): Likewise.
+ * g10/getkey.c (lookup): Likewise.
+ (have_secret_key_with_kid): Likewise.
+ * g10/keylist.c (list_all): Likewise.
+ (keyring_rebuild_cache): Likewise.
+ * g10/keyserver.c (keyidlist): Likewise.
+ * g10/trustdb.c (validate_key_list): Likewise.
+
+ gpg: Correctly handle an error.
+ * g10/keyring.c (keyring_search): If a compare function returns an
+ error, treat it as an error.
+
+ gpg: Correctly handle keyblocks followed by legacy keys.
+ * g10/keyring.c (keyring_get_keyblock): If we encounter a legacy
+ packet after already having some non-legacy packets, then treat the
+ legacy packet as a keyblock boundary, not as part of the keyblock.
+ * g10/t-keydb-get-keyblock.c: New file.
+ * g10/t-keydb-get-keyblock.gpg: New file.
+ * g10/Makefile.am (EXTRA_DIST): Add t-keydb-get-keyblock.gpg.
+ (module_tests): Add t-keydb-get-keyblock.
+ (t_keydb_get_keyblock_SOURCES): New variable.
+ (t_keydb_get_keyblock_LDADD): Likewise.
+
+ gpg: Make debugging search descriptors easier.
+ * g10/keydb.c (dump_search_desc): Rename from this...
+ (keydb_search_desc_dump): ... to this. Only process a single search
+ descriptor. Improve output. Don't mark as static. Update callers.
+
+ gpg: Add function format_keyid.
+ * g10/options.h (opt.keyid_format): Add new value KF_DEFAULT.
+ * g10/keyid.c (format_keyid): New function.
+ (keystr): Use it.
+
+ gpg: Use a more appropriate error code.
+ * g10/gpg.c (check_user_ids): Return a more appropriate error code if
+ a user id is ambiguous.
+
+2015-11-17 Justus Winter <justus at g10code.com>
+
+ Fix typos found using codespell.
+ * agent/cache.c: Fix typos.
+ * agent/call-pinentry.c: Likewise.
+ * agent/call-scd.c: Likewise.
+ * agent/command-ssh.c: Likewise.
+ * agent/command.c: Likewise.
+ * agent/divert-scd.c: Likewise.
+ * agent/findkey.c: Likewise.
+ * agent/gpg-agent.c: Likewise.
+ * agent/w32main.c: Likewise.
+ * common/argparse.c: Likewise.
+ * common/audit.c: Likewise.
+ * common/audit.h: Likewise.
+ * common/convert.c: Likewise.
+ * common/dotlock.c: Likewise.
+ * common/exechelp-posix.c: Likewise.
+ * common/exechelp-w32.c: Likewise.
+ * common/exechelp-w32ce.c: Likewise.
+ * common/exechelp.h: Likewise.
+ * common/helpfile.c: Likewise.
+ * common/i18n.h: Likewise.
+ * common/iobuf.c: Likewise.
+ * common/iobuf.h: Likewise.
+ * common/localename.c: Likewise.
+ * common/logging.c: Likewise.
+ * common/openpgp-oid.c: Likewise.
+ * common/session-env.c: Likewise.
+ * common/sexputil.c: Likewise.
+ * common/sysutils.c: Likewise.
+ * common/t-sexputil.c: Likewise.
+ * common/ttyio.c: Likewise.
+ * common/util.h: Likewise.
+ * dirmngr/cdblib.c: Likewise.
+ * dirmngr/certcache.c: Likewise.
+ * dirmngr/crlcache.c: Likewise.
+ * dirmngr/dirmngr-client.c: Likewise.
+ * dirmngr/dirmngr.c: Likewise.
+ * dirmngr/dirmngr_ldap.c: Likewise.
+ * dirmngr/dns-stuff.c: Likewise.
+ * dirmngr/http.c: Likewise.
+ * dirmngr/ks-engine-hkp.c: Likewise.
+ * dirmngr/ks-engine-ldap.c: Likewise.
+ * dirmngr/ldap-wrapper.c: Likewise.
+ * dirmngr/ldap.c: Likewise.
+ * dirmngr/misc.c: Likewise.
+ * dirmngr/ocsp.c: Likewise.
+ * dirmngr/validate.c: Likewise.
+ * g10/encrypt.c: Likewise.
+ * g10/getkey.c: Likewise.
+ * g10/gpg.c: Likewise.
+ * g10/gpgv.c: Likewise.
+ * g10/import.c: Likewise.
+ * g10/keydb.c: Likewise.
+ * g10/keydb.h: Likewise.
+ * g10/keygen.c: Likewise.
+ * g10/keyid.c: Likewise.
+ * g10/keylist.c: Likewise.
+ * g10/keyring.c: Likewise.
+ * g10/mainproc.c: Likewise.
+ * g10/misc.c: Likewise.
+ * g10/options.h: Likewise.
+ * g10/packet.h: Likewise.
+ * g10/parse-packet.c: Likewise.
+ * g10/pkclist.c: Likewise.
+ * g10/pkglue.c: Likewise.
+ * g10/plaintext.c: Likewise.
+ * g10/server.c: Likewise.
+ * g10/sig-check.c: Likewise.
+ * g10/sqlite.c: Likewise.
+ * g10/tdbio.c: Likewise.
+ * g10/test-stubs.c: Likewise.
+ * g10/tofu.c: Likewise.
+ * g10/trust.c: Likewise.
+ * g10/trustdb.c: Likewise.
+ * g13/create.c: Likewise.
+ * g13/mountinfo.c: Likewise.
+ * kbx/keybox-blob.c: Likewise.
+ * kbx/keybox-file.c: Likewise.
+ * kbx/keybox-init.c: Likewise.
+ * kbx/keybox-search-desc.h: Likewise.
+ * kbx/keybox-search.c: Likewise.
+ * kbx/keybox-update.c: Likewise.
+ * scd/apdu.c: Likewise.
+ * scd/app-openpgp.c: Likewise.
+ * scd/app-p15.c: Likewise.
+ * scd/app.c: Likewise.
+ * scd/ccid-driver.c: Likewise.
+ * scd/command.c: Likewise.
+ * scd/iso7816.c: Likewise.
+ * sm/base64.c: Likewise.
+ * sm/call-agent.c: Likewise.
+ * sm/call-dirmngr.c: Likewise.
+ * sm/certchain.c: Likewise.
+ * sm/gpgsm.c: Likewise.
+ * sm/import.c: Likewise.
+ * sm/keydb.c: Likewise.
+ * sm/minip12.c: Likewise.
+ * sm/qualified.c: Likewise.
+ * sm/server.c: Likewise.
+ * tools/gpg-check-pattern.c: Likewise.
+ * tools/gpgconf-comp.c: Likewise.
+ * tools/gpgkey2ssh.c: Likewise.
+ * tools/gpgparsemail.c: Likewise.
+ * tools/gpgtar.c: Likewise.
+ * tools/rfc822parse.c: Likewise.
+ * tools/symcryptrun.c: Likewise.
+
+2015-11-16 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix error checking and improve error reporting.
+ * g10/gpg.c (check_user_ids): Differentiate between a second result
+ and an error. If the key specification is ambiguous or an error
+ occurs, set RC appropriately.
+
+2015-11-14 Werner Koch <wk at gnupg.org>
+
+ gpg: Use only one fingerprint formatting function.
+ * g10/gpg.h (MAX_FORMATTED_FINGERPRINT_LEN): New.
+ * g10/keyid.c (hexfingerprint): Add optional args BUFFER and BUFLEN.
+ Change all callers.
+ (format_hexfingerprint): New.
+ * g10/keylist.c (print_fingerprint): Change to use hexfingerprint.
+ * g10/tofu.c (fingerprint_format): Remove. Replace calls by
+ format_hexfingerprint.
+
+2015-11-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Simplify the tofu interface by using the public key packet.
+ * g10/tofu.c (fingerprint_str): Remove.
+ (tofu_register): Take a public key instead of a fingerprint as arg.
+ Use hexfingerprint() to get a fpr from the PK.
+ (tofu_get_validity): Ditto.
+ (tofu_set_policy, tofu_get_policy): Simplify by using hexfingerprint.
+ * g10/trustdb.c (tdb_get_validity_core): Pass the primary key PK to
+ instead of the fingerprint to the tofu functions.
+
+ gpg: Make trusted-key override for Tofu robust against swapped tofu.db.
+ * g10/tofu.c (get_trust): For the UTK check lookup the key by
+ fingerprint.
+
+ gpg: Fix regression in --locate-keys (in 2.1.9).
+ * g10/getkey.c (getkey_ctx_s): Add field "extra_list".
+ (get_pubkey_byname): Store strings in the context.
+ (getkey_end): Free EXTRA_LIST.
+
+2015-11-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Print a new EXPORTED status line.
+ * common/status.h (STATUS_EXPORTED): New.
+ * g10/export.c (print_status_exported): New.
+ (do_export_stream): Call that function.
+
+ gpg: Print export statistics to the status-fd.
+ * common/status.h (STATUS_EXPORT_RES): New.
+ * g10/main.h (export_stats_t): New.
+ * g10/export.c (export_stats_s): New.
+ (export_new_stats, export_release_stats): New.
+ (export_print_stats): New.
+ (export_pubkeys, export_seckeys, export_secsubkeys)
+ (export_pubkey_buffer, do_export): Add arg "stats".
+ (do_export_stream): Add arg stats and update it.
+ * g10/gpg.c (main) <aExport, aExportSecret, aExportSecretSub>: Create,
+ pass, and print a stats object to the export function calls.
+
+ * g10/export.c (export_pubkeys_stream): Remove unused function.
+
+ dirmngr: Do not block during ADNS calls.
+ * dirmngr/dns-stuff.c: Include npth.h
+ (my_unprotect, my_protect): New wrapper.
+ (resolve_name_adns): Put unprotect/protect around adns calls.
+ (get_dns_cert): Ditto.
+ (getsrv): Ditto.
+ (get_dns_cname): Ditto.
+
+ dirmngr: New option --nameserver.
+ * dirmngr/dirmngr.c (oNameServer): New.
+ (opts): Add --nameserver.
+ (parse_rereadable_options): Act upon oNameServer.
+ * dirmngr/dns-stuff.c (DEFAULT_NAMESERVER): New.
+ (tor_nameserver): New.
+ (set_dns_nameserver): New.
+ (my_adns_init): Make name server configurable.
+
+2015-11-11 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix cache consistency problem.
+ g10/keyring.c (keyring_search): Only mark the cache as completely
+ filled if we start the scan from the beginning of the keyring.
+
+2015-11-10 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Default to the the PGP trust model.
+ * g10/trustdb.c (init_trustdb): If we can't read the trust model from
+ the trust DB, default to TM_PGP, not TM_TOFU_PGP.
+
+ gpg: Default to the flat TOFU DB format.
+ * g10/tofu.c (opendbs): If the TOFU DB format is set to auto and there
+ is no TOFU DB, default to the flat format.
+
+2015-11-09 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Change to new ADNS Tor mode init scheme.
+ * dirmngr/dns-stuff.c (tor_credentials): New.
+ (enable_dns_tormode): Add arg new_circuit and update tor_credentials.
+ (my_adns_init): Rework to set Tor mode using a config file options and
+ always use credentials.
+ * dirmngr/server.c (cmd_dns_cert): Improve error message.
+ * dirmngr/t-dns-stuff.c (main): Add option --new-circuit.
+
+ dirmngr: Improve detection of ADNS.
+ * configure.ac (HAVE_ADNS_FREE): New ac_define.
+
+2015-11-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Add reder information to --card-status.
+ * g10/call-agent.h, g10/call-agent.c (agent_release_card_info)
+ g10/card-util.c (card_status): Add READER.
+ * scd/apdu.c (close_ccid_reader, open_ccid_reader): Handle RDRNAME.
+ (apdu_get_reader_name): New.
+ * scd/ccid-driver.c (ccid_open_reader): Add argument to RDRNAME_P.
+ * scd/command.c (cmd_learn): Return READER information.
+
+2015-11-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid new strings.
+ * g10/decrypt-data.c (decrypt_data): Use already translated strings.
+
+ common: Fix commit f99830b.
+ * common/userids.c (classify_user_id): Avoid underflow. Use spacep to
+ also trim tabs.
+
+2015-11-06 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix formatting string.
+ * g10/decrypt-data.c (decrypt_data): Fix formatting string.
+
+ gpg: Add new option --only-sign-text-ids.
+ * g10/options.h (opt): Add field only_sign_text_ids.
+ * g10/gpg.c (enum cmd_and_opt_values): Add value oOnlySignTextIDs.
+ (opts): Handle oOnlySignTextIDs.
+ (main): Likewise.
+ * g10/keyedit.c (sign_uids): If OPT.ONLY_SIGN_TEXT_IDS is set, don't
+ select non-text based IDs automatically.
+ (keyedit_menu): Adapt the prompt asking to sign all user ids according
+ to OPT.ONLY_SIGN_TEXT_IDS.
+ * doc/gpg.texi: Document the new option --only-sign-text-ids.
+
+ common: When classifying keyids and fingerprints, reject trailing junk.
+ * common/userids.c (classify_user_id): Trim any trailing whitespace.
+ Before assuming that a hexstring corresponds to a key id or
+ fingerprint, make sure that it is NUL terminated.
+
+ gpg: Check for ambiguous or non-matching key specs.
+ * g10/gpg.c (check_user_ids): New function.
+ (main): Check that any user id specifications passed to --local-user
+ and --remote-user correspond to exactly 1 user. Check that any user
+ id specifications passed to --default-key correspond to at most 1
+ user. Warn if any user id specifications passed to --local-user or
+ --default-user are possible ambiguous (are not specified by long keyid
+ or fingerprint).
+ * g10/getkey.c (parse_def_secret_key): Don't warn about possible
+ ambiguous key descriptions here.
+
+ common: Add new function strlist_rev.
+ * common/strlist.c (strlist_rev): New function.
+ * common/t-strlist.c: New file.
+ * common/Makefile.am (common_sources): Add strlist.c and strlist.h.
+ (module_tests): Add t-strlist.
+ (t_strlist_LDADD): New variable.
+
+ common: Include required, but not included headers in t-support.h.
+ * common/t-support.h: Include <stdlib.h> and <stdio.h>.
+
+2015-11-05 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Indicate which characters are invalid.
+ * g10/keygen.c (ask_user_id): Indicate which characters are invalid.
+
+ gpg: Add support for unwrapping the outer level of encryption.
+ * g10/decrypt-data.c (decrypt_data): If OPT.UNWRAP_ENCRYPTION is set,
+ copy the data to the output file instead of continuing to process it.
+ * g10/gpg.c (enum cmd_and_opt_values): Add new value oUnwrap.
+ (opts): Handle oUnwrap.
+ (main): Likewise.
+ * g10/options.h (opt): Add field unwrap_encryption.
+ * g10/plaintext.c (handle_plaintext): Break the output file selection
+ functionality into ...
+ (get_output_file): ... this new function.
+
+ common: Add a function for copying data from one iobuf to another.
+ * common/iobuf.c (iobuf_copy): New function.
+
+ doc: Note that gpgkey2ssh is deprecated.
+ * doc/tools.texi (gpgkey2ssh): Note that gpgkey2ssh is deprecated.
+
+ tools: Fix gpgkey2ssh's most gratuitous errors. Use gpg2, not gpg.
+ * tools/gpgkey2ssh.c (main): Add support for --help. Replace the most
+ gratuitous asserts with error messages. Invoke gpg2, not gpg.
+
+2015-11-05 Neal H. Walfield <neal at g10code.com>
+ Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ doc: Add documentation for gpgkey2ssh.
+ * doc/tools.texi: Add documentation for gpgkey2ssh.
+
+2015-11-04 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Print a better error message for --multifile --sign --encrypt.
+ * g10/gpg.c (main): Print a better error message for --multifile
+ --sign --encrypt.
+
+ gpg: Add --encrypt-to-default-key.
+ * g10/getkey.c (parse_def_secret_key): Drop the static qualifier and
+ export the function.
+ * g10/gpg.c (enum cmd_and_opt_values): Add value oEncryptToDefaultKey.
+ (opts): Handle oEncryptToDefaultKey.
+ (main): Likewise.
+ * g10/options.h (opt): Add field encrypt_to_default_key.
+
+ gpg: Allow multiple --default-key options. Take the last available key.
+ * g10/getkey.c (parse_def_secret_key): New function.
+ (get_seckey_default): Add parameter ctrl. Update callers. Use
+ parse_def_secret_key to get the default secret key, if any.
+ (getkey_byname): Likewise.
+ (enum_secret_keys): Likewise.
+ * g10/options.h (opt): Change def_secret_key's type from a char * to a
+ strlist_t.
+ * g10/gpg.c (main): When processing --default-key, add the key to
+ OPT.DEF_SECRET_KEY.
+ * g10/gpgv.c (get_session_key): Add parameter ctrl. Update callers.
+ * g10/mainproc.c (proc_pubkey_enc): Likewise.
+ (do_proc_packets): Likewise.
+ * g10/pkclist.c (default_recipient): Likewise.
+ * g10/pubkey-enc.c (get_session_key): Likewise.
+ * g10/sign.c (clearsign_file): Likewise.
+ (sign_symencrypt_file): Likewise.
+ * g10/skclist.c (build_sk_list): Likewise.
+ * g10/test-stubs.c (get_session_key): Likewise.
+
+2015-11-04 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix error handling with libusb-compat library.
+ * scd/ccid-driver.c (bulk_out): Use LIBUSB_ERRNO_NO_SUCH_DEVICE.
+
+ scd: fix change_keyattr.
+ * scd/app-openpgp.c (change_keyattr_from_string): Fix parsing.
+
+2015-11-03 Werner Koch <wk at gnupg.org>
+
+ gpg: Change out of core error message.
+ * g10/tofu.c (fingerprint_str): Die with the error code returned by
+ the failed function.
+ (time_ago_str): Ditto. Do not make a comma translatable.
+ (fingerprint_format): Use "%zu" for a size_t.
+
+ gpg: Make translation easier.
+ * g10/import.c (import_secret_one): Split info string for easier
+ translation.
+
+2015-11-03 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Also show when the most recently signed message was observed.
+ * g10/tofu.c (show_statistics): Also show when the most recently
+ signed message was observed.
+
+ gpg: Split a utility function out of a large function.
+ * g10/tofu.c (show_statistics): Break the time delta to string code
+ into...
+ (time_ago_str): ... this new function.
+
+ gpg: Fix message formatting.
+ * g10/tofu.c (get_trust): Fix message formatting.
+
+ gpg: Don't store formatting fingerprints in the TOFU DB.
+ * g10/tofu.c (fingerprint_pp): Split this function into...
+ (fingerprint_str): ... this function...
+ (fingerprint_format): ... and this function.
+ (record_binding): Store the unformatted fingerprint in the DB. Only
+ use the formatting fingerprint when displaying a message to the user.
+ (get_trust): Likewise.
+ (show_statistics): Likewise.
+ (tofu_register): Likewise.
+ (tofu_get_validity): Likewise.
+ (tofu_set_policy): Likewise.
+ (tofu_get_policy): Likewise.
+
+2015-11-02 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: notify a user when importing stub is skipped.
+ * g10/import.c (transfer_secret_keys): Return GPG_ERR_NOT_PROCESSED
+ when stub_key_skipped.
+ (import_secret_one): Notify a user, suggesting --card-status.
+
+2015-10-31 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Consider newlines to be whitespace in an SQL statement.
+ * g10/sqlite.c (sqlite3_stepx): When making sure that there is no
+ second SQL statement, ignore newlines.
+
+2015-10-30 Werner Koch <wk at gnupg.org>
+
+ common: Improve t-zb32 to be used for manual encoding.
+ * common/t-support.h (no_exit_on_fail, errcount): New.
+ (fail): Bump errcount.
+ * common/t-zb32.c (main): Add options to allow manual use.
+
+ common: Add separate header for zb32.c.
+ * common/util.h (zb32_encode): Move prototype to ...
+ * common/zb32.h: new. Include this for all callers of zb32_encode.
+
+2015-10-29 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Display the correct error message.
+ * g10/trustdb.c (validate_keys): If tdbio_update_version_record fails,
+ RC does not contain the error code. Save the error code in rc2 and
+ use that.
+
+ gpg: Eliminate a memory leak.
+ * g10/trustdb.c (validate_key_list): Don't leak the keyblocks on
+ failure.
+
+ gpg: Remove unused prototype.
+ g10/keyring.h (keyring_locate_writable): Remove unused prototype.
+
+ gpg: Eliminate a memory leak.
+ * g10/gpg.c (main): Don't leak OPT.DEF_RECIPIENT.
+
+ gpg: Fix keyring support.
+ * g10/keydb.c (keydb_rebuild_caches): Only mark the cached as prepared
+ if it is actually prepared, which it only is if the resource is a
+ keybox.
+
+ gpg: Change sqlite3_stepx to pass the sqlite3_stmt * to the callback.
+ * g10/sqlite.h (enum sqlite_arg_type): Add SQLITE_ARG_BLOB.
+ (sqlite3_stepx_callback): New declaration.
+ (sqlite3_stepx): Change the callback's type to sqlite3_stepx_callback,
+ which passes an additional parameter, the sqlite3_stmt *. Update
+ users.
+
+ gpg: Move sqlite helper functions into their own file.
+ * g10/tofu.c (sqlite3_exec_printf): Move from here...
+ * g10/sqlite.c (sqlite3_exec_printf): ... to this new file. Don't
+ mark as static.
+ * g10/tofu.c (sqlite3_stepx): Move from here...
+ * g10/sqlite.c (sqlite3_stepx): ... to this new file. Don't
+ mark as static.
+ * g10/tofu.c (enum sqlite_arg_type): Move from here...
+ * g10/sqlite.h (enum sqlite_arg_type): ... to this new file.
+
+2015-10-29 NIIBE Yutaka <gniibe at fsij.org>
+
+ doc: Don't install gpg-zip.1.
+ * doc/Makefile.am (myman_pages): Remove gpg-zip.1.
+ (DISTCLEANFILES): Add gpg-zip.1.
+
+2015-10-28 Werner Koch <wk at gnupg.org>
+
+ sm: Allow combination of usage flags --gen-key.
+ * sm/certreqgen.c (create_request): Re-implement building of the
+ key-usage extension.
+
+2015-10-28 Damien Goutte-Gattat <dgouttegattat at incenp.org>
+
+ doc: Document some changed default options.
+ * doc/gpg.texi: Update the description of some options which are
+ now enabled by default.
+
+2015-10-28 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix NULL-deref while loading a CRL.
+ * dirmngr/crlcache.c (crl_parse_insert): Set error before leaping to
+ failure.
+
+ dirmngr: Minor cleanup of the SRV RR code.
+ * dirmngr/dns-stuff.c: Include unistd.h.
+ (getsrv): Run srand only once.
+ * dirmngr/t-dns-stuff.c (main): Allow passing another name for --srv
+ and change output format.
+
+ dirmngr: Add a getaddrinfo wrapper backend using ADNS.
+ * dirmngr/dns-stuff.c: Replace all use of default_errsource.
+ (my_adns_init): Move to top.
+ (resolve_name_adns): New.
+ (resolve_dns_name) [USE_ADNS]: Divert to new func.
+
+2015-10-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Do not call an extra get_validity if no-show-uid-validity is used.
+ * g10/mainproc.c (check_sig_and_print): Do not call the informational
+ get_validity if we are not going to use it.
+
+2015-10-26 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: Ensure all weak digest rejection notices are shown.
+ * g10/main.h: Add rejection_shown flag to each weakhash struct
+ * g10/misc.c (print_digest_algo_note, additional_weak_digest): Do not
+ treat MD5 separately; (print_digest_rejected_note): Use
+ weakhash.rejection_shown instead of static shown.
+ * g10/options.h (opt): Change from additional_weak_digests to
+ weak_digests.
+ * g10/sig-check.c: Do not treat MD5 separately.
+ * g10/gpg.c (main): Explicitly set MD5 as weak.
+ * g10/gpgv.c (main): Explicitly set MD5 as weak.
+
+2015-10-26 Werner Koch <wk at gnupg.org>
+
+ w32: Make it build again if Tofu support is not available.
+ * g10/keylist.c (public_key_list) [!USE_TOFU]: Do not call tofu
+ functions.
+
+ dirmngr: Support Tor hidden services.
+ * dirmngr/dns-stuff.c (is_onion_address): New.
+ * dirmngr/ks-engine-hkp.c (hostinfo_s): Add field "onion".
+ (map_host): Special case onion addresses.
+ (ks_hkp_print_hosttable): Print an 'O' for an onion address.
+ * dirmngr/http.c (connect_server): Special case onion addresses.
+
+ dirmngr,w32: Remove gethostbyname hack and make it build again.
+ * dirmngr/http.c (connect_server) [W32]: Remove gethostbyname hack;
+ we require getaddrinfo anyway.
+ * dirmngr/dns-stuff.c (AI_ADDRCONFIG): Add replacement if not defined.
+ (map_eai_to_gpg_error) [W32]: Take care of unsupported codes.
+
+2015-10-26 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Make sure we only have a single SQL statement.
+ * g10/tofu.c (sqlite3_stepx): Make sure SQL only contains a single SQL
+ statement.
+
+ gpg: When the TOFU DB is in batch mode, periodically drop the locks.
+ * g10/tofu.c: Include <sched.h>.
+ (batch_update_started): New variable.
+ (begin_transaction): If we've been in batch mode for a while, then
+ commit any extant batch transactions.
+ (tofu_begin_batch_update): If we are not in batch mode, initialize
+ batch_update_started.
+
+2015-10-25 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Add workaround for broken getaddrinfo.
+ * dirmngr/dns-stuff.c (resolve_name_standard): On failure retry by
+ first resolving the CNAME.
+ (get_dns_cname): New.
+
+ * dirmngr/t-dns-stuff.c (main): Add option --cname.
+
+ dirmngr: Better handle systems without IPv6 or IPv4.
+ * dirmngr/dns-stuff.c (resolve_name_standard): Use AI_ADDRCONFIG.
+
+ dirmngr: Replace use of getnameinfo by resolve_dns_addr.
+ * dirmngr/ks-engine-hkp.c (my_getnameinfo): Remove.
+ (map_host): Use resolve_dns_addr.
+
+ dirmngr: Implement a getnameinfo wrapper.
+ * dirmngr/dns-stuff.h (DNS_NUMERICHOST): New.
+ (DNS_WITHBRACKET): New.
+ * dirmngr/dns-stuff.c (resolve_name_standard): Factor code out to...
+ (map_eai_to_gpg_error): new.
+ (resolve_addr_standard): New.
+ (resolve_dns_addr): New.
+
+ * dirmngr/ks-engine-hkp.c (is_ip_address): Move to ...
+ * dirmngr/dns-stuff.c (is_ip_address): here. Add support for non
+ bracketed v6 addresses.
+
+ * dirmngr/t-dns-stuff.c: Remove header netdb.h.
+ (main): Add option --bracket. Use resolve_dns_name instead of
+ getnameinfo.
+
+2015-10-23 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Provide an interface to patch TOFU updates.
+ * g10/tofu.c (struct db): Rename begin_transaction to savepoint_batch.
+ Rename end_transaction to savepoint_batch_commit. Update users.
+ Remove field rollback. Add fields savepoint_inner and
+ savepoint_inner_commit. Add field batch_update.
+ (dump_cache): New function.
+ (batch_update): New variable.
+ (begin_transaction). New function.
+ (end_transaction): New function.
+ (rollback_transaction): New function.
+ (tofu_begin_batch_update): New function.
+ (tofu_end_batch_update): New function.
+ (closedb): End any pending batch transaction.
+ (closedbs): Assert that none of the DBs have a started batch
+ transaction if we not in batch mode.
+ (record_binding): Use the begin_transaction, end_transaction and
+ rollback_transaction functions instead of including the SQL inline.
+ Also start a batch mode transaction if we are using the flat format.
+ (tofu_register): Use the begin_transaction, end_transaction and
+ rollback_transaction functions instead of including the SQL inline.
+ * g10/gpgv.c (tofu_begin_batch_update): New function.
+ (tofu_end_batch_update): New function.
+ * g10/test-stubs.c (tofu_begin_batch_update): New function.
+ (tofu_end_batch_update): New function.
+
+ gpg: Cache prepared SQL queries and open DB connections.
+ * g10/tofu.c: Include <stdarg.h>.
+ (prepares_saved) [DEBUG_TOFU_CACHE]: New variable.
+ (queries) [DEBUG_TOFU_CACHE]: New variable.
+ (struct db): Add fields prevp, begin_transaction, end_transaction,
+ rollback, record_binding_get_old_policy, record_binding_update,
+ record_binding_update2, get_policy_select_policy_and_conflict,
+ get_trust_bindings_with_this_email, get_trust_gather_other_user_ids,
+ get_trust_gather_other_keys, register_already_seen, and
+ register_insert.
+ [DEBUG_TOFU_CACHE]: Add field hits.
+ (STRINGIFY): New macro.
+ (STRINGIFY2): New macro.
+ (enum sqlite_arg_type): New enum.
+ (sqlite3_stepx): New function.
+ (combined_db): Remove variable.
+ (opendb): Don't cache the combined db.
+ (struct dbs): New struct. Update users to use this as the head of the
+ local DB list rather than overloading struct db.
+ (unlink_db): New function.
+ (link_db): New function.
+ (db_cache): New variable.
+ (db_cache_count): New variable.
+ (DB_CACHE_ENTRIES): Define.
+ (getdb): If the dbs specific cache doesn't include the DB, look at
+ DB_CACHE. Only if that also doesn't include the DB open the
+ corresponding DB.
+ (closedb): New function.
+ (opendbs): Don't open the combined DB. Just return an initialized
+ struct dbs.
+ (closedbs): Don't close the dbs specific dbs. Attach them to the
+ front of DB_CACHE. If DB_CACHE contains more than DB_CACHE_ENTRIES,
+ close enough dbs from the end of the DB_CACHE list such that DB_CACHE
+ only contains DB_CACHE_ENTRIES. Don't directly close the dbs, instead
+ use the new closedb function.
+ [DEBUG_TOFU_CACHE]: Print out some statistics.
+ (record_binding): Use sqlite3_stepx instead of sqlite3_exec or
+ sqlite3_exec_printf.
+ (get_policy): Likewise.
+ (get_trust): Likewise.
+ (tofu_register): Likewise.
+
+ gpg: Return the DBs meta-handle rather than the sqlite3 handle.
+ * g10/tofu.c (getdb): Return a struct db * instead of an sqlite *.
+ Update users.
+
+ gpg: Use the proper type.
+ * g10/options.h: Include "tofu.h".
+ (opt.tofu_default_policy): Change type to enum tofu_policy.
+ * g10/gpgv.c (enum tofu_policy): Don't redeclare.
+ * g10/test-stubs.c (enum tofu_policy): Likewise.
+
+2015-10-22 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Implement Tor mode for SRV RRs.
+ * dirmngr/dns-stuff.c (get_dns_cert): Factor adns init out to...
+ (my_adns_init): new.
+ (getsrv)[USE_ADNS]: Use my_adns_init.
+ (getsrv)[!USE_ADNS]: Return an error if Tor mode is active.
+
+ * dirmngr/t-dns-stuff.c: Add option --use-tor.
+
+ dirmngr: Do not use MAXDNAME.
+ * dirmngr/dns-stuff.c (getsrv): Replace MAXDNAME.
+ * dirmngr/dns-stuff.h (MAXDNAME): Remove.
+ (struct srventry): Use a fixed value instead of MAXDNAME.
+ * dirmngr/http.c (connect_server): Use DIMof instead of MAXDNAME.
+ Malloc a helper array.
+
+ Move SRV RR code from common/ to dirmngr/.
+ * common/srv.c: Merge into dirmngr/dns-stuff.c. Delete file.
+ * common/srv.h: Merge into dirmngr/dns-stuff.h. Delete file.
+ * common/Makefile.am (common_sources): Remove srv.c and srv.h.
+ * g10/keyserver.c: Do not include srv.h. The code using it is anyway
+ disabled.
+ * dirmngr/http.c: Remove header srv.h and stubs.
+ * dirmngr/t-dns-stuff.c: Add option --srv.
+
+2015-10-21 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Use the new DNS wrapper for the HTTP module.
+ * dirmngr/t-http.c (main): Init assuan sockets.
+ * dirmngr/http.c: Include dns-stuff.h.
+ (connect_server)[!HAVE_GETADDRINFO]: Remove all code.
+ (connect_server): Change to use resolve_dns_name.
+
+ dirmngr: Allow use of http.c if USE_NPTH is not defined.
+ * dirmngr/http.c (send_request): Always set the gnutls pull/push
+ functions.
+ (my_npth_read): Rename to ...
+ (my_gnutls_read) .. this. Use system read if !USE_NPTH.
+ (my_npth_write): Rename to ...
+ (my_gnutls_write) .. this. Use system write if !USE_NPTH.
+
+ dirmngr: Check that getaddrinfo is available.
+ * dirmngr/Makefile.am (t_http_SOURCES): Add dns-stuff.c.
+ (t_ldap_parse_uri_SOURCES): Ditto.
+ * dirmngr/dns-stuff.c: Bail out if neither ADNS nor getaddrinfo is
+ available.
+
+ dirmngr: Use the new DNS wrapper for the HKP engine.
+ * dirmngr/ks-engine-hkp.c (my_getnameinfo): Change arg type to
+ dns_addrinfo_t.
+ (map_host): Replace getaddrinfo by resolve_dns_name.
+
+ dirmngr: Implement a getaddrinfo wrapper.
+ * dirmngr/dns-stuff.h: Include some header files.
+ (dns_addinfo_t, dns_addrinfo_s): New.
+ * dirmngr/dns-stuff.c: Always include DNS related headers.
+ (free_dns_addrinfo): New.
+ (resolve_name_standard): New.
+ (resolve_dns_name): New.
+
+ * dirmngr/t-dns-stuff.c: Include netdb.h.
+ (main): Keep old default mode with no args but else print outout of
+ resolve_dns_name. Revamp option parser.
+
+ common: Add more replacement error codes.
+ * common/util.h (GPG_ERR_SERVER_FAILED): New.
+ (GPG_ERR_NO_KEY): New.
+ (GPG_ERR_NO_NAME): New.
+
+2015-10-21 Neal H. Walfield <neal at g10code.com>
+
+ gpg: If the saved trust model is unknown, default to tofu+pgp.
+ * g10/trustdb.c (init_trustdb): If the saved trust model is unknown,
+ default to tofu+pgp instead of pgp.
+
+ gpg: Don't accidentally free UTK_LIST.
+ * g10/trustdb.c (validate_keys): Don't free UTK_LIST.
+
+ gpg: When evaluating trust reg exps, treat tofu+pgp like pgp.
+ * g10/trustdb.c (validate_one_keyblock): When checking trust regular
+ expressions, treat the tofu+pgp trust model the same as the pgp trust
+ model.
+
+ gpg: If a key is ultimate trusted, return that in the tofu model.
+ * g10/tofu.c (get_trust): If the policy is auto or none, check if the
+ key is ultimately trusted. If so, return that.
+ (tofu_register): If the key is ultimately trusted, don't show any
+ statistics.
+ (tofu_get_validity): Likewise.
+
+ gpg: Keep the trust DB up to date for the tofu and tofu+pgp models.
+ * g10/trustdb.c (init_trustdb): Recognize tofu and tofu+pgp as
+ possibly saved trust models. Also register the ultimately trusted
+ keys if the trust model is tofu or tofu+pgp.
+ (check_trustdb): Don't skip if the trust model is tofu or tofu+pgp.
+ (update_trustdb): Likewise.
+ (tdb_check_trustdb_stale): Likewise.
+ (validate_keys): If the trust model is TOFU, just write out the
+ ultimately trusted keys.
+
+ gpg: Factor out code into a standalone function.
+ * g10/trustdb.c (tdb_keyid_is_utk): New function.
+ (add_utk): Use it.
+
+ dirmngr: Allow building with libassuan < 2.3.
+ * dirmngr/http.c (send_request): Use newer assuan function only if
+ available.
+
+2015-10-21 Neal H. Walfield <neal at g10code.com>
+ Andre Heinecke <aheinecke at intevation.de>
+
+ gpg: Make the tofu DB check and initialization atomic.
+ * g10/tofu.c (initdb): Make the version check and the database
+ initialization atomic.
+
+2015-10-21 Werner Koch <wk at gnupg.org>
+
+ build: Make --disable-g13 the default.
+ * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Add --enable-g13. Remove
+ --enable-gpgtar because that is enabled anyway.
+ * configure.ac: Do not build g13 by default.
+
+ dirmngr: Rename file dns-cert.c.
+ * dirmngr/dns-cert.c: Rename to dirmngr/dns-stuff.c.
+ * dirmngr/dns-cert.h: Rename to dirmngr/dns-stuff.h and change
+ includers.
+ * dirmngr/t-dns-cert.c: Rename to dirmngr/t-dns-stuff.c.
+ * dirmngr/Makefile.am: Adjust.
+
+ common: Add status code for use by g13.
+ * common/status.h (STATUS_PLAINTEXT_FOLLOWS): New.
+
+2015-10-20 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Prefer ADNS over system resolver.
+ * configure.ac (HAVE_ADNS_IF_TORMODE): New ac_define.
+ (USE_DNS_CERT): Prefer ADNS over the system resolver.
+ * dirmngr/dns-cert.c (tor_mode): New global var.
+ (enable_dns_tormode): New func.
+ (get_dns_cert): Use DNS resolver at 8.8.8.8 in tor-mode.
+ * dirmngr/server.c (cmd_dns_cert): If supported allow DNS requests.
+
+ w32: Allow building again.
+ * dirmngr/http.c (connect_server): Fix called function name.
+
+ build: Allow building without SQLlite support.
+ * configure.ac: Add option --dsiable-tofu and --disable-sqlite.
+ (NEED_SQLITE_VERSION): New var.
+ (USE_TOFU): New ac_define and am_conditional.
+ * autogen.sh (build-w32): Add PKG_CONFIG_LIBDIR to configure so that
+ pkg-config find the correct .pc file.
+
+ * g10/Makefile.am (tofu_source): New. Build only if enabled.
+ * g10/gpg.c (parse_trust_model)[!USE_TOFU]: Disable tofu models.
+ (parse_tofu_policy)[!USE_TOFU]: Disable all.
+ (parse_tofu_db_format)[!USE_TOFU]: Disable all.
+ (main) <aTOFUPolicy>[!USE_TOFU]: Skip.
+ * g10/keyedit.c (show_key_with_all_names_colon)[!USE_TOFU]: Do not
+ call tofu functions.
+ * g10/keylist.c (list_keyblock_colon)[!USE_TOFU]: Ditto.
+ * g10/trustdb.c (tdb_get_validity_core)[!USE_TOFU]: Skip tofu
+ processing.
+
+2015-10-20 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Don't die immediately if the TOFU DB is locked.
+ * g10/tofu.c (opendb): Don't die immediately if the DB is locked.
+
+ gpg: Improve output.
+ * g10/tofu.c (get_trust): Also show the binding when indicating a
+ conflict occurred.
+
+ gpg: Synchronize translation template.
+ * g10/tofu.c (show_statistics): Synchronize translation template.
+
+ gpg: When showing conflicts, also show bindings with no recorded sigs.
+ * g10/tofu.c (signature_stats_collect_cb): If the time_ago column is
+ NULL, then both time_ago and count should be 0.
+ (get_trust): Reverse the direction of the join so that we also get
+ statistics about bindings without any signatures.
+
+ gpg: Improve text.
+ * g10/tofu.c (show_statistics): Improve text.
+
+ gpg: Use the right variable to display the information.
+ * g10/tofu.c (get_trust): Use the right variable to display the
+ conflicting key.
+
+ gpg: Make failing to create a directory a soft error.
+ * g10/tofu.c (getdb): Don't exit if we can't create the directory.
+ Just return an error.
+
+ common: Make sure tilde expansion works for the mkdir functions.
+ * common/mkdir_p.c (gnupg_amkdir_p): Use make_filename_try on the
+ first directory component as well.
+
+ gpg: Remove unused prototype digest_algo_from_sig.
+ * g10/packet.h (digest_algo_from_sig): Remove prototype without a
+ corresponding implementation.
+
+2015-10-19 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Allow building with libassuan < 2.3.
+ * dirmngr/dirmngr.c (set_tor_mode): Use newer assuan function only if
+ available.
+ * dirmngr/http.c (http_raw_connect): Ditto.
+
+2015-10-19 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix --desig-revoke.
+ * g10/revoke.c (gen_desig_revoke): Add additional parameter ctrl.
+ Check that the secret key is available. If not, display an error
+ message.
+
+ gpg: Improve function documentation and some comments.
+ * g10/main.h: Improve function documentation.
+ * g10/packet.h.h: Improve function documentation.
+ * g10/sig-check.c: Improve function documentation and some comments.
+
+ gpg: Improve and regularize naming of signature checking functions.
+ * g10/packet.h (signature_check): Rename from this...
+ (check_signature): ... to this. Update users.
+ (signature_check2): Rename from this...
+ (check_signature2): ... to this. Update users.
+ * g10/sig-check.c (do_check): Rename from this...
+ (check_signature_end): ... to this. Update users.
+ (do_check_messages): Rename from this...
+ (check_signature_metadata_validity): ... to this. Update users.
+
+ gpg: Mark local function as static.
+ * g10/tdbio.c (put_record_into_cache): Mark as static.
+
+2015-10-19 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: Print warning when rejecting weak digests.
+ * g10/misc.c (print_md5_rejected_note): Rename to ..
+ (print_digest_rejected_note): this. Parameterize function to take an
+ enum gcry_md_algos.
+ * g10/sig-check.c: Use print_digest_rejected_note() when rejecting
+ signatures.
+
+ gpg: Add option --weak-digest to gpg and gpgv.
+ * g10/options.h: Add additional_weak_digests linked list to opts.
+ * g10/main.h: Declare weakhash linked list struct and
+ additional_weak_digest() function to insert newly-declared weak
+ digests into opts.
+ * g10/misc.c: (additional_weak_digest): New function.
+ (print_digest_algo_note): Check for deprecated digests; use proper
+ gcry_md_algos type.
+ * g10/sig-check.c: (do_check): Reject weak digests in addition to MD5.
+ * g10/gpg.c: Add --weak-digest option to gpg.
+ * doc/gpg.texi: Document gpg --weak-digest option.
+ * g10/gpgv.c: Add --weak-digest option to gpgv.
+ * doc/gpgv.texi: Document gpgv --weak-digest option.
+
+2015-10-19 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Make --use-tor work - still leaks DNS.
+ * dirmngr/dirmngr.c (set_tor_mode): New.
+ (main, reread_configuration): Call it.
+ * dirmngr/http.c (http_raw_connect, send_request): Check whether TOR
+ mode is enabled if the FORCE_TOR flag is given.
+
+ dirmngr: Use Assuan socket wrappers for http.c.
+ * dirmngr/http.c: Include assuan.h. Changed all code taking a socket
+ descriptor from int to assuan_fd_t.
+ (my_unprotect, my_protect): New.
+ (my_connect): Remove.
+ (_my_socket_new, _my_socket_unref): use assuan_sock_close.
+ (connect_server): Use assuan_sock_connect, assuan_sock_new, and
+ assuan_sock_close.
+ * dirmngr/Makefile.am (t_common_ldadd): Add LIBASSUAN_LIBS.
+
+2015-10-19 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix formatting.
+ * g10/tofu.c (get_trust): Fix formatting.
+
+ gpg: Don't forget to free some memory.
+ * g10/tofu.c (tofu_register): Free SIG_DIGEST before returning.
+
+ gpg: If a conflict occurs in batch mode, record that.
+ * g10/tofu.c (get_trust): If a conflict occurs when MAY_ASK is false,
+ set conflict to the key. When prompting the user, don't show the
+ conflicting key if the conflicting key is the current key.
+
+2015-10-18 Werner Koch <wk at gnupg.org>
+
+ gpg: Silence two more warnings.
+ * g10/trustdb.c (tdb_get_validity_core): Silence a warning.
+ * g10/tofu.c (tofu_register): Move SIG_DIGEST computation to the top
+ so that it is not uninitialized in case of an early error.
+
+ gpg: Fix harmless compiler warnings.
+ * g10/tofu.h (_tofu_GET_POLICY_ERROR): New. This avoids warnings
+ about undefined enum values in a switch.
+ * g10/trustdb.h (_tofu_GET_TRUST_ERROR): New.
+ * g10/tofu.c (TIME_AGO_FUTURE_IGNORE): Move to the top.
+ (opendbs): Avoid compiler warning (use braces).
+ (GET_POLICY_ERROR): Replace define by enum _tofu_GET_POLICY_ERROR.
+ (get_policy): Remove assert.
+ (GET_TRUST_ERROR): Replace by _tofu_GET_TRUST_ERROR macro.
+ (show_statistics): Undef MIN_SECS et al. after use.
+
+ common: Avoid warning about const char ** assignment.
+ * common/mkdir_p.c (gnupg_amkdir_p): Also strdup first item. Return
+ an error on malloc failure.
+ (gnupg_mkdir_p): Fix type of dirs and tmp_dirs.
+
+ Move http module from common/ to dirmngr/.
+ * common/http.c: Move to ../dirmngr/.
+ * common/http.h: Move to ../dirmngr/.
+ * common/t-http.c: Move to ../dirmngr/.
+ * common/tls-ca.pem: Move to ../dirmngr/.
+ * common/Makefile.am: Do not build libcommontls.a libcommontlsnpth.a.
+ Remove http.c related stuff.
+ * po/POTFILES.in: Move http.c to dirmngr/.
+ * dirmngr/Makefile.am (EXTRA_DIST): Add tls-ca.pem.
+ (module_maint_tests): New.
+ (noinst_PROGRAMS): Add module_maint_tests.
+ (dirmngr_SOURCES): Add http.c and http.h.
+ (dirmngr_LDADD): Remove libcommontlsnpth.
+ (t_common_ldadd): Ditto.
+ (t_http_SOURCES, t_http_CFLAGS, t_http_LDADD): New.
+ (t_ldap_parse_uri_SOURCES): Add http.c.
+ (t_ldap_parse_uri_CFLAGS): Build without npth.
+ ($(PROGRAMS)): Do not require libcommontls.a libcommontlsnpth.a.
+ * dirmngr/dirmngr.h, dirmngr/ks-engine.h: Fix include of http.h.
+
+2015-10-18 Neal H. Walfield <neal at g10code.com>
+
+ g10: Fix assert.
+ * g10/tofu.c (get_trust): Fix assert.
+
+ g10: Add TOFU support.
+ * configure.ac: Check for sqlite3.
+ (SQLITE3_CFLAGS): AC_SUBST it.
+ (SQLITE3_LIBS): Likewise.
+ * g10/Makefile.am (AM_CFLAGS): Add $(SQLITE3_CFLAGS).
+ (gpg2_SOURCES): Add tofu.h and tofu.c.
+ (gpg2_LDADD): Add $(SQLITE3_LIBS).
+ * g10/tofu.c: New file.
+ * g10/tofu.h: New file.
+ * g10/options.h (trust_model): Define TM_TOFU and TM_TOFU_PGP.
+ (tofu_db_format): Define.
+ * g10/packet.h (PKT_signature): Add fields digest and digest_len.
+ * g10/gpg.c: Include "tofu.h".
+ (cmd_and_opt_values): Declare aTOFUPolicy, oTOFUDefaultPolicy,
+ oTOFUDBFormat.
+ (opts): Add them.
+ (parse_trust_model): Recognize the tofu and tofu+pgp trust models.
+ (parse_tofu_policy): New function.
+ (parse_tofu_db_format): New function.
+ (main): Initialize opt.tofu_default_policy and opt.tofu_db_format.
+ Handle aTOFUPolicy, oTOFUDefaultPolicy and oTOFUDBFormat.
+ * g10/mainproc.c (do_check_sig): If the signature is good, copy the
+ hash to SIG->DIGEST and set SIG->DIGEST_LEN appropriately.
+ * g10/trustdb.h (get_validity): Add arguments sig and may_ask. Update
+ callers.
+ (tdb_get_validity_core): Add arguments sig and may_ask. Update
+ callers.
+ * g10/trust.c (get_validity) Add arguments sig and may_ask. Pass them
+ to tdb_get_validity_core.
+ * g10/trustdb.c: Include "tofu.h".
+ (trust_model_string): Handle TM_TOFU and TM_TOFU_PGP.
+ (tdb_get_validity_core): Add arguments sig and may_ask. If
+ OPT.TRUST_MODEL is TM_TOFU or TM_TOFU_PGP, compute the TOFU trust
+ level. Combine it with the computed PGP trust level, if appropriate.
+ * g10/keyedit.c: Include "tofu.h".
+ (show_key_with_all_names_colon): If the trust mode is tofu or
+ tofu+pgp, then show the trust policy.
+ * g10/keylist.c: Include "tofu.h".
+ (public_key_list): Also show the PGP stats if the trust model is
+ TM_TOFU_PGP.
+ (list_keyblock_colon): If the trust mode is tofu or
+ tofu+pgp, then show the trust policy.
+ * g10/pkclist.c: Include "tofu.h".
+ * g10/gpgv.c (get_validity): Add arguments sig and may_ask.
+ (enum tofu_policy): Define.
+ (tofu_get_policy): New stub.
+ (tofu_policy_str): Likewise.
+ * g10/test-stubs.c (get_validity): Add arguments sig and may_ask.
+ (enum tofu_policy): Define.
+ (tofu_get_policy): New stub.
+ (tofu_policy_str): Likewise.
+ * doc/DETAILS: Describe the TOFU Policy field.
+ * doc/gpg.texi: Document --tofu-set-policy, --trust-model=tofu,
+ --trust-model=tofu+pgp, --tofu-default-policy and --tofu-db-format.
+ * tests/openpgp/Makefile.am (TESTS): Add tofu.test.
+ (TEST_FILES): Add tofu-keys.asc, tofu-keys-secret.asc,
+ tofu-2183839A-1.txt, tofu-BC15C85A-1.txt and tofu-EE37CF96-1.txt.
+ (CLEANFILES): Add tofu.db.
+ (clean-local): Add tofu.d.
+ * tests/openpgp/tofu.test: New file.
+ * tests/openpgp/tofu-2183839A-1.txt: New file.
+ * tests/openpgp/tofu-BC15C85A-1.txt: New file.
+ * tests/openpgp/tofu-EE37CF96-1.txt: New file.
+ * tests/openpgp/tofu-keys.asc: New file.
+ * tests/openpgp/tofu-keys-secret.asc: New file.
+
+2015-10-16 Neal H. Walfield <neal at g10code.com>
+
+ common: Prefix the mkdir functions with gnupg_. Make args const.
+ * common/mkdir_p.h (mkdir_p): Rename from this...
+ (gnupg_mkdir_p): ... to this. Change directory_component's type from
+ char * to const char *.
+ (amkdir_p): Rename from this...
+ (gnupg_amkdir_p): ... to this. Change directory_component's type from
+ char * to const char *.
+ * common/mkdir_p.c (mkdir_p): Rename from this...
+ (gnupg_mkdir_p): ... to this. Change directory_component's type from
+ char * to const char *.
+ (amkdir_p): Rename from this...
+ (gnupg_amkdir_p): ... to this. Change directory_component's type from
+ char * to const char *.
+
+2015-10-14 NIIBE Yutaka <gniibe at fsij.org>
+
+ cleanup: Fix confusion between gpg_error_t and gpg_err_code_t.
+ * dirmngr/crlcache.c (hash_dbfile): Use gpg_error_t for ERR.
+ * kbx/keybox-update.c (keybox_set_flags): Call
+ gpg_err_code_from_syserror.
+
+2015-10-13 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+2015-10-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Try hard to use MDC also for sign+symenc.
+ * g10/encrypt.c (use_mdc): Make it a global func.
+ * g10/sign.c (sign_symencrypt_file): Use that function to decide
+ whether to use an MDC.
+ * tests/openpgp/conventional-mdc.test: Add a simple test case.
+
+2015-10-09 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.9.
+
+2015-10-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: simplify agent_get_passphrase.
+ * agent/call-pinentry.c (agent_get_passphrase): Simplify.
+
+ agent: fix agent_askpin.
+ * agent/call-pinentry.c (agent_askpin): Fix off-by-one error.
+
+ agent: Fix function return type for check_cb and agent_askpin.
+ * agent/call-pinentry.c (unlock_pinentry): Return gpg_error_t.
+ (start_pinentry, setup_qualitybar): Likewise.
+ (agent_askpin): Fix return value check of check_cb.
+ * agent/command-ssh.c (reenter_compare_cb): Return gpg_error_t.
+ (ssh_identity_register): Fix return value check of agent_askpin.
+ * agent/cvt-openpgp.c (try_do_unprotect_cb): Return gpg_error_t.
+ * agent/findkey.c (try_unprotect_cb): Likewise.
+ * agent/genkey.c (reenter_compare_cb): Return gpg_error_t.
+ (agent_ask_new_passphrase): Fix return value check of agent_askpin.
+
+2015-10-08 Andre Heinecke <aheinecke at intevation.de>
+
+ dirmngr: Default to http protocol for http-proxy.
+ * common/http.c (send_request): Fix handling for hostname:port string.
+
+2015-10-08 Werner Koch <wk at gnupg.org>
+
+ common: Allow building of mkdir_p.c for Windows.
+ * common/mkdir_p.c: Change license and comment debug statements.
+ (amkdir_p, mkdir_p): Fail on malloc error and use default_errsource to
+ build an error code. Change return value to gpg_error_t.
+ (amkdir_p): Use gnupg_mkdir.
+
+ * common/membuf.c: Include util.h first to avoid redefined macro
+ warnings.
+
+ gpg: Add option --print-dane-records.
+ * g10/options.h (opt): Add field "print_dane_records".
+ * g10/gpg.c (oPrintDANERecords): new.
+ (opts): Add --print-dane-records.
+ (main): Set that option.
+ * g10/export.c (do_export): Remove EXPORT_DANE_FORMAT handling.
+ (do_export_stream): Add EXPORT_DANE_FORMAT handling.
+ * g10/keylist.c (list_keyblock_pka): Implement DANE record printing.
+
+ * g10/gpgv.c (export_pubkey_buffer): New stub.
+ * g10/test-stubs.c (export_pubkey_buffer): New stub.
+
+ gpg: Pass CTRL parameter to all key listing functions.
+ * g10/keylist.c (public_key_list): Add arg CTRL.
+ (secret_key_list): Ditto.
+ (list_all, list_one): Ditto.
+ (locate_one): Ditto.
+ (list_keyblock_pka): Ditto.
+ (list_keyblock): Ditto.
+ (list_keyblock_direct): Ditto.
+ * g10/keygen.c (proc_parameter_file): Add arg CTRL.
+ (read_parameter_file): Ditto.
+ (quick_generate_keypair): Ditto.
+ (do_generate_keypair): Ditto.
+ (generate_keypair): Pass arg CTRL.
+ * g10/gpg.c (main): Pass arg CTRL to quick_generate_keypair.
+
+2015-10-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove unfinished experimental code to export as S-expressions.
+ * g10/options.h (EXPORT_SEXP_FORMAT): Remove.
+ (EXPORT_DANE_FORMAT): New.
+ * g10/export.c (parse_export_options): Remove "export-sexp-format".
+ (export_seckeys): Adjust for removed option.
+ (export_secsubkeys): Ditto.
+ (do_export): Prepare for DANE format.
+ (build_sexp, build_sexp_seckey): Remove.
+ (do_export_stream): Remove use of removed functions.
+
+2015-10-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Add new --auto-key-locate mechanism "dane".
+ * g10/call-dirmngr.c (gpg_dirmngr_dns_cert): Allow fetching via DANE.
+ * g10/keyserver.c (keyserver_import_cert): Add arg "dane_mode".
+ * g10/options.h (AKL_DANE): New.
+ * g10/getkey.c (get_pubkey_byname): Implement AKL_DANE.
+ (parse_auto_key_locate): Ditto.
+
+ dirmngr: Addlow fetching keys using OpenPGP DANE.
+ * dirmngr/server.c (cmd_dns_cert): Add option --dane.
+
+ dirmngr: Improve DNS code to retrieve arbitrary records.
+ * dirmngr/dns-cert.c (get_dns_cert): Add hack to retrieve arbitrary
+ resource records.
+ * dirmngr/dns-cert.h (DNS_CERTTYPE_RRBASE): New.
+ (DNS_CERTTYPE_RR61): New.
+
+ dirmngr: Change DNS code to make additions easier.
+ * dirmngr/dns-cert.c (get_dns_cert) [!USE_ADNS]: Change loop to allow
+ adding more resource types.
+
+ dirmngr: Make commands RELOADDIRMNGR and KILLDIRMNGR work properly.
+ * dirmngr/server.c (cmd_killdirmngr): Set assuan close flag.
+ (cmd_reloaddirmngr): Use check_owner_permission.
+
+ dirmngr: Do tilde expansion for --hkp-cacert.
+ * dirmngr/dirmngr.c (parse_rereadable_options): Do tilde expansion and
+ check for cert file existance in option --hkp-cacert.
+
+ gpg: Fail decryption for AES etc message w/o MDC.
+ * g10/mainproc.c (proc_encrypted): Fail for modern messages w/o MDC.
+
+2015-10-06 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix verification of signature for smartcard.
+ * agent/pksign.c (agent_pksign_do): Use public key smartcard.
+
+ agent: Fix non-allocation for pinentry_loopback.
+ * agent/call-pinentry.c (agent_get_passphrase): Don't allocate, it will
+ be allocated by pinentry_loopback.
+
+2015-10-05 Werner Koch <wk at gnupg.org>
+
+ gpg: Install a dirmngr.conf file.
+ * g10/dirmngr-conf.skel: New.
+ * g10/Makefile.am (EXTRA_DIST): Add file.
+ (install-data-local, uninstall-local): Install that file.
+ * g10/openfile.c (copy_options_file): Add arg "name", return a value,
+ simplify with xstrconcat, and factor warning message out to:
+ (try_make_homedir): here. Also install dirmngr.conf.
+ * g10/options.skel: Remove --keyserver entry.
+
+ gpg: Deprecate the --keyserver option.
+ * g10/keyserver.c (keyserver_refresh): Change return type to
+ gpg_error_t. Use gpg_dirmngr_ks_list to print the name of the
+ keyserver to use.
+ (keyserver_search): Do not print the "no keyserver" error
+ message. The same error is anyway returned from dirmngr.
+ * g10/call-dirmngr.c (ks_status_parm_s): Add field "keyword".
+ (ks_status_cb): Handle other status keywords.
+ (gpg_dirmngr_ks_list): New.
+ * tools/gpgconf-comp.c (gc_options_gpg): Deprecate "keyserver".
+ (gc_options_dirmngr): Add "Keyserver" group and "keyserver".
+
+ dirmngr: Add option --keyserver.
+ * dirmngr/dirmngr.c (oKeyServer): New.
+ (opts): Add "keyserver".
+ (parse_rereadable_options): Parse that options
+ (main): Add option to the gpgconf list.
+ * dirmngr/dirmngr.h (opt): Add field "keyserver".
+ * dirmngr/server.c (ensure_keyserver): New.
+ (make_keyserver_item): New. Factored out from
+ (cmd_keyserver): here. Call ensure_keyserver.
+ (cmd_ks_search): Call ensure_keyserver.
+ (cmd_ks_get): Ditto.
+ (cmd_ks_fetch): Ditto.
+ (cmd_ks_put): Ditto.
+
+ dirmngr: Make clear that --use-tor is not yet ready for use.
+ * dirmngr/dirmngr.c (main): Print a warning if --use-tor has been
+ given.
+ * tools/gpgconf-comp.c (gc_options_dirmngr): Make --use-tor invisible.
+
+ gpgconf: Change displayed name of Dirmngr to "Key Acquirer".
+ * tools/gpgconf-comp.c (gc_component): Change printed name.
+
+2015-10-02 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix use-after-free due to a realloc shrinking.
+ * dirmngr/ks-engine-hkp.c (map_host): Do not use original pointer
+ after realloc.
+
+ agent: Fix alignment problem with the second passphrase struct.
+ * agent/genkey.c (agent_ask_new_passphrase): Use a separate malloc for
+ PI2. Check return value of the malloc function.
+ * agent/command-ssh.c (ssh_identity_register): Use a separate malloc
+ for PI2. Wipe PI2.
+
+2015-10-01 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix a practical hang after use of --faked-system-time.
+ * g10/sign.c (update_keysig_packet): Bail out if we would need to long
+ for a new timestamp.
+
+ gpg: Print more info with "check selfsig".
+ * g10/keyedit.c (print_and_check_one_sig): Print more Some sigsub
+ packets.
+
+ gpg: Add debug helper to --edit-keys's check sub-command.
+ * g10/keyedit.c (print_and_check_one_sig): Add arg "extended" and
+ print an asterisk for the chosen selfsig.
+ (check_all_keysigs): Add arg "only_selfsig"
+ (keyedit_menu) <cmdCHECK>: Add optional arg "selfsig".
+
+2015-10-01 NIIBE Yutaka <gniibe at fsij.org>
+
+ common: Fix strsplit.
+ * common/stringhelp.c (strsplit): Fix arguments order.
+
+2015-09-30 Neal H. Walfield <neal at g10code.com>
+
+ common: Add mkdir_p.
+ * common/mkdir_p.c: New file.
+ * common/mkdir_p.h: New file.
+ * common/Makefile.am (common_sources): Add mkdir_p.c and mkdir_p.h.
+
+ common: Remove unused files.
+ * common/xmalloc.c: Remove file.
+ * common/xmalloc.h: Remove file.
+
+ common: Include <gpg-error.h>.
+ * common/logging.h: Include <gpg-error.h>.
+
+2015-09-29 Neal H. Walfield <neal at g10code.com>
+
+ g10: Remove unused struct cmp_help_context_s.
+ * g10/sig-check.c (struct cmp_help_context_s) Remove unused struct.
+
+ g10: Avoid an unnecessary copy.
+ * g10/sig-check.c (signature_check2): Avoid copying PK to RET_PK.
+ Instead, directly use the provided storage. If none is provided
+ allocate some.
+
+2015-09-29 NIIBE Yutaka <gniibe at fsij.org>
+
+ ssh: Fix fingerprint computation for EdDSA key.
+ * common/ssh-utils.c (get_fingerprint): Handle the prefix of 0x40.
+ * common/t-ssh-utils.c (sample_keys): Add a new key.
+
+ agent: RSA signature verification by gpg-agent.
+ * g10/sign.c (do_sign): Let verify signature by gpg-agent.
+ * agent/pksign.c (agent_pksign_do): Call gcry_pk_verify for RSA.
+
+2015-09-28 Werner Koch <wk at gnupg.org>
+
+ common: Provide two new error code replacements.
+ * common/util.h (GPG_ERR_FALSE, GPG_ERR_TRUE): Rew replcements.
+
+ common: Change calling convention for gnupg_spawn_process.
+ * common/exechelp.h (GNUPG_SPAWN_NONBLOCK): New.
+ (GNUPG_SPAWN_RUN_ASFW, GNUPG_SPAWN_DETACHED): Macro to replace the
+ numbers.
+ * common/exechelp.h (gnupg_spawn_process): Change function to not take
+ an optional stream for stdin but to return one.
+ * common/exechelp-posix.c (gnupg_spawn_process): Implement change.
+ (create_pipe_and_estream): Add args outbound and nonblock.
+ * common/exechelp-w32.c (gnupg_spawn_process): Implement change.
+
+2015-09-28 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Handle error correctly.
+ * scd/apdu.c (apdu_connect): Initialize variables and check an error
+ of apdu_get_status_internal.
+
+2015-09-22 Werner Koch <wk at gnupg.org>
+
+ ssh: Add 256, 384 and 521 bit test keys for the fingerprint.
+ * common/t-ssh-utils.c (sample_keys): Add 3 new keys.
+
+ ssh: Fix fingerprint computation for 384 bit ECDSA keys.
+ * common/ssh-utils.c (get_fingerprint): Fix hashed string.
+
+2015-09-19 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix importing ECC key.
+ * agent/cvt-openpgp.c (convert_from_openpgp_main): Only encrypted
+ parameters are stored as opaque.
+ (apply_protection): ARRAY members are all normal, non-opaque MPI.
+ (extract_private_key): Get public key as normal, non-opaque MPI.
+ Remove support of ECC key with '(flags param)'.
+ Remove support of "ecdsa" and "ecdh" keys of our experiment.
+
+ scd: Fix KEYTOCARD handling for ECC key.
+ * scd/app-openpgp.c (ecc_writekey): Only public key can be native
+ format.
+
+2015-09-19 Neal H. Walfield <neal at g10code.com>
+
+ common: Add new function strlist_length.
+ * common/strlist.c (strlist_length): New function.
+
+2015-09-18 Werner Koch <wk at gnupg.org>
+
+ gpgconf: Change displayed name of Dirmngr to "Network Manager".
+ * tools/gpgconf-comp.c (gc_component): Change printed name.
+
+ dirmngr: Add option --use-tor as a stub.
+ * dirmngr/dirmngr.h (opt): Add field "use_tor".
+ * dirmngr/dirmngr.c (oUseTor): New.
+ (opts): Add --use-tor.
+ (parse_rereadable_options): Set option.
+ (main): Tell gpgconf about that option.
+
+ * dirmngr/crlfetch.c (crl_fetch): Pass TOR flag to the http module and
+ return an error if LDAP is used in TOR mode.
+ (ca_cert_fetch): Return an error in TOR mode.
+ (start_cert_fetch): Ditto.
+ * dirmngr/ks-engine-finger.c (ks_finger_fetch): Pass TOR flag to the
+ http module.
+ * dirmngr/ks-engine-hkp.c (send_request): Ditto.
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
+ * dirmngr/ks-engine-ldap.c (ks_ldap_get): Return an error in TOR mode.
+ (ks_ldap_search): Ditto.
+ (ks_ldap_put): Ditto.
+ * dirmngr/ocsp.c (do_ocsp_request): Ditto. Also pass TOR flag to the
+ http module.
+
+ * dirmngr/server.c (option_handler): Add "honor-keyserver-url-used".
+ (cmd_dns_cert): Return an error in TOR mode.
+ (cmd_getinfo): Add subcommand "tor"
+ * tools/gpgconf-comp.c (gc_options_dirmngr): Add TOR group.
+
+ gpg: Report a conflict between honor-keyserver-url and TOR.
+ * g10/call-dirmngr.c (create_context): Send option and print a verbose
+ error.
+
+ http: Add flag to force use of TOR (part 1)
+ * common/http.h (HTTP_FLAG_FORCE_TOR): New.
+ * common/http.c (http_raw_connect, send_request): Detect flag and
+ return an error for now.
+
+2015-09-17 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+ scd: Fix ccid-driver timeout for OpenPGPcard v2.1.
+ * scd/ccid-driver.c (CCID_CMD_TIMEOUT): New.
+ (ccid_transceive_apdu_level, ccid_transceive): Use.
+
+2015-09-16 Werner Koch <wk at gnupg.org>
+
+ agent: New option --pinentry-invisible-char.
+ * agent/gpg-agent.c (oPinentryInvisibleChar): New.
+ (opts): Add option.
+ (parse_rereadable_options): Set option.
+ * agent/agent.h (opt): Add field pinentry_invisible_char.
+ * agent/call-pinentry.c (start_pinentry): Pass option to pinentry.
+
+ g13: Move some code to a separate module.
+ * g13/g13-common.c, g13/g13-common.h: New.
+ * g13/Makefile.am (g13_SOURCES): Add new files.
+ * g13/g13.c (g13_errors_seen): Move to g13-common.c.
+ (cmdline_conttype): New.
+ (main): Use g13_init_signals and g13_install_emergency_cleanup.
+ (emergency_cleanup, g13_exit): Move to g13-common.c.
+ * g13/g13.h: Move OPT and some other code to g13-common.h.
+
+ gpg: Fix skip function dummy parameter.
+ * g10/trustdb.c (search_skipfnc): Fix dummy argument
+
+ gpg: Change last commit to avoid extra translations.
+ * g10/keyedit.c (keyedit_menu): Do not print usage hints in expert
+ mode.
+
+2015-09-16 Neal H. Walfield <neal at g10code.com>
+
+ g10: Improve error message.
+ * g10/keyedit.c (keyedit_menu): When complaining that a user ID or key
+ must be selected, indicate what command to use to do this.
+
+ g10: Be more careful when merging self-signed data.
+ * g10/getkey.c (merge_selfsigs_main): Stop looking for self-signed
+ data belonging to the public key when we encounter an attribute packet
+ or a subkey packet, not just a user id packet. When looking for
+ self-signed data belonging to a user id packet, stop when we see a
+ user attribute packet.
+
+ g10: Simplify some complicated boolean expressions.
+ * g10/getkey.c (finish_lookup): Simplify logic.
+
+ g10: Also mark revoked and expired keys as unusable.
+ * g10/getkey.c (skip_unusable): Also mark the key as unusable if it
+ has been revoked or has expired.
+
+ g10: Release resources when returning an error in get_seckey.
+ * g10/getkey.c (get_seckey): If the key doesn't have a secret key,
+ release *PK.
+
+ g10: Improve documentation and comments for getkey.c.
+ * g10/getkey.c: Improve documentation and comments for most
+ functions. Move documentation for public functions from here...
+ * g10/keydb.h: ... to here.
+
+ g10: Remove unused function have_any_secret_key.
+ * g10/getkey.c (have_any_secret_key): Remove function.
+
+ g10: Bring cache semantics closer to non-cache semantics.
+ * g10/getkey.c (get_pubkey_fast): When reading from the cache, only
+ consider primary keys.
+
+ g10: Break out of the loop earlier.
+ * g10/getkey.c (have_secret_key_with_kid): Once we find the relevent
+ key or subkey, stop searching.
+
+ g10: Don't skip legacy keys if the search mode is KEYDB_SEARCH_MODE_NEXT
+ * g10/getkey.c (lookup): Also don't skip legacy keys if the search
+ mode is KEYDB_SEARCH_MODE_NEXT.
+
+ g10: Remove unused function get_seckeyblock_byfprint.
+ * g10/keydb.h (get_seckeyblock_byfprint): Remove prototype.
+ * g10/getkey.c (get_seckeyblock_byfprint): Remove function.
+
+ g10: Remove unused function get_seckey_byfprint.
+ * g10/keydb.h (get_seckey_byfprint): Remove prototype.
+ * g10/getkey.c (get_seckey_byfprint): Remove function.
+
+ g10: Simplify get_seckey_byname: it was never called with NAME not NULL.
+ * g10/keydb.h (get_seckey_byname): Rename from this...
+ (get_seckey_default): ... to this. Drop the parameter name. Update
+ users.
+ * g10/getkey.c (get_seckey_byname): Rename from this...
+ (get_seckey_default): ... to this. Drop the parameter name. Drop the
+ code which assumed that NAME is not NULL.
+
+ g10: Eliminate the redundant function get_keyblock_byfprint.
+ * g10/keydb.h (get_keyblock_byfprint): Remove prototype. Replace use
+ of this function with get_pubkey_byfprint.
+ * g10/getkey.c (get_pubkey_byname): Remove function.
+
+ g10: Simplify semantics of get_pubkey_byname.
+ * g10/getkey.c (get_pubkey_byname): If R_KEYBLOCK is not NULL, return
+ the keyblock in R_KEYBLOCK independent of whether PK is set or not.
+
+ g10: Eliminate the redundant function get_pubkey_byname.
+ * g10/getkey.c (get_pubkey_byname): Remove function.
+ (lookup): Replace use of get_pubkey_byname by get_pubkey_byfprint.
+
+ g10: Eliminate the redundant function get_pubkey_end.
+ * g10/keydb.h (get_pubkey_end): Remove declaration. Replace use of
+ function with getkey_end.
+ * g10/getkey.c (get_pubkey_byname): Remove function.
+
+ g10: Eliminate the redundant function get_pubkey_next.
+ * g10/keydb.h (get_pubkey_next): Remove prototype.
+ * g10/getkey.c (get_pubkey_next): Remove function.
+ * g10/keylist.c (locate_one): Use getkey_next instead of
+ get_pubkey_next.
+
+ kbx: Change skipfnc's prototype so that we can provide all information.
+ * kbx/keybox-search-desc.h (struct keydb_search_desc.skipfnc): Change
+ third parameter to be the index of the user id packet in the keyblock
+ rather than the packet itself. Update users.
+
+ g10: Remove unused prototype (get_pubkey_byfpr).
+ * g10/keydb.h (get_pubkey_byfpr): Remove unused prototype.
+
+ g10: Remove unused function (get_pubkey_bynames).
+ * g10/keydb.h (get_pubkey_bynames): Remove prototype.
+ * g10/getkey.c (get_pubkey_bynames): Remove function.
+
+ g10: Simplify code. Turn struct getkey_ctx_s.found_key into an argument
+ * g10/getkey.c (struct getkey_ctx_s): Remove field found_key.
+ (lookup): Add argument ret_found_key. If not NULL, set it to the
+ found key. Update callers.
+ (pk_from_block): Add argument found_key. Use it instead of
+ CTX->FOUND_KEY. Update callers.
+ (finish_lookup): Return a KBNODE (the found key) instead of an int.
+ Don't set CTX->FOUND_KEY. Return the found key instead.
+
+ g10: Remove unused field struct getkey_ctx_s.kbpos.
+ * g10/getkey.c (struct getkey_ctx_s): Remove field kbpos.
+ (getkey_end): Don't clear CTX->KBPOS.
+
+ g10: Simplify code: remove field struct getkey_ctx_s.keyblock.
+ * g10/getkey.c (struct getkey_ctx_s): Remove field keyblock.
+ (finish_lookup): Add parameter keyblock. Update caller to pass this.
+ (lookup): Add new local variable keyblock. Use this instead of
+ ctx->keyblock for referencing the keyblock.
+
+2015-09-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix registering SSH Key of Ed25519.
+ * agent/command-ssh.c (stream_read_string): Add the prefix of 0x40.
+
+2015-09-15 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+2015-09-10 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.8.
+
+ tests: Silence the 5gb-packet test.
+ * tests/openpgp/4gb-packet.test: Send output to /dev/null.
+
+ g10: Fix make distcheck problem.
+ * g10/test.c: Include string.h.
+ (prepend_srcdir): New. Taken from Libgcrypt.
+ (test_free): New.
+ * g10/t-keydb.c (do_test): Malloc the filename.
+ * g10/Makefile.am (AM_CPPFLAGS): Remove -DSOURCE_DIR
+ (EXTRA_DIST): Add t-keydb-keyring.kbx.
+
+ g10: Improve portability of the new test driver.
+ * g10/test.c: Include stdio.h and stdlib.h.
+ (verbose): New.
+ (print_results): Rename to exit_tests.
+ (main): Remove atexit and call exit_tests. Set verbose.
+ (ASSERT, ABORT): Call exit_tests instead of exit.
+
+2015-09-09 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Allow sending much larger keyblocks.
+ * dirmngr/server.c (MAX_CERT_LENGTH): Increase to 16k.
+ (MAX_KEYBLOCK_LENGTH): Increase to 20M.
+
+2015-09-07 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Force key attribute change for writekey.
+ * scd/app-openpgp.c (change_rsa_keyattr): New.
+ (change_keyattr_from_string): Use change_rsa_keyattr.
+ (rsa_writekey): Call change_rsa_keyattr when different size.
+ (ecc_writekey): Try to change key attribute.
+
+ scd: KEYNO cleanup.
+ * scd/app-openpgp.c (get_public_key, send_keypair_info, do_readkey)
+ (change_keyattr, change_keyattr_from_string, ecc_writekey, do_genkey)
+ (compare_fingerprint, check_against_given_fingerprint): KEYNO starts
+ from 0.
+
+2015-09-02 Neal H. Walfield <neal at g10code.com>
+
+ g10: Remove unused field req_algo.
+ * g10/packet.h (PKT_public_key): Remove unused field req_algo. Remove
+ users.
+ * g10/getkey.c (struct getkey_ctx_s): Remove unused field req_algo.
+ Remove users.
+
+ g10: Use a symbolic constant instead of a literal.
+ * g10/trustdb.c (KEY_HASH_TABLE_SIZE): Define.
+ (new_key_hash_table): Use KEY_HASH_TABLE_SIZE instead of a literal.
+ (release_key_hash_table): Likewise.
+ (test_key_hash_table): Likewise.
+ (add_key_hash_table): Likewise.
+
+ g10: Add test for keydb as well as new testing infrastructure.
+ * g10/Makefile.am (EXTRA_DIST): Add test.c.
+ (AM_CPPFLAGS): Add -DSOURCE_DIR="\"$(srcdir)\"".
+ (module_tests): Add t-keydb.
+ (t_keydb_SOURCES): New variable.
+ (t_keydb_LDADD): Likewise.
+ * g10/t-keydb.c: New file.
+ * g10/t-keydb-keyring.kbx: New file.
+ * g10/test-stubs.c: New file.
+ * g10/test.c: New file.
+
+ g10: Make the keyblock cache per-handle rather than global.
+ * g10/keydb.c (keyblock_cache): Don't declare this variable. Instead...
+ (struct keyblock_cache): ... turn its type into this first class
+ object...
+ (struct keydb_handle): ... and instantiate it once per database
+ handle. Update all users.
+ (keydb_rebuild_caches): Don't invalidate the keyblock cache.
+
+ g10: If iobuf_seek fails when reading from the cache, do a hard read.
+ * g10/keydb.c (keydb_get_keyblock): If the iobuf_seek fails when
+ reading from the cache, then simply clear the cache and try reading
+ from the database.
+
+ iobuf: Reduce verbosity of test.
+ * common/t-iobuf.c (main): Reduce verbosity.
+
+ iobuf: Add the IOBUF_INPUT_TEMP type to improve input temp handling.
+ * common/iobuf.h (enum iobuf_use): Add new member, IOBUF_INPUT_TEMP.
+ * common/iobuf.c (iobuf_temp_with_content): Create the iobuf as an
+ IOBUF_INPUT_TEMP, not an IOBUF_INPUT buffer. Assert that LENGTH ==
+ A->D.SIZE.
+ (iobuf_push_filter2): If A is an IOBUF_INPUT_TEMP, then make the new
+ filter an IOBUF_INPUT filter and set its buffer size to
+ IOBUF_BUFFER_SIZE.
+ (underflow): If A is an IOBUF_INPUT_TEMP, then just return EOF; don't
+ remove already read data.
+ (iobuf_seek): If A is an IOBUF_INPUT_TEMP, don't discard the buffered
+ data.
+ (iobuf_alloc): Allow USE == IOBUF_INPUT_TEMP.
+ (pop_filter): Allow USE == IOBUF_INPUT_TEMP.
+ (iobuf_peek): Allow USE == IOBUF_INPUT_TEMP.
+ (iobuf_writebyte): Fail if USE == IOBUF_INPUT_TEMP.
+ (iobuf_write): Fail if USE == IOBUF_INPUT_TEMP.
+ (iobuf_writestr): Fail if USE == IOBUF_INPUT_TEMP.
+ (iobuf_flush_temp): Fail if USE == IOBUF_INPUT_TEMP.
+
+ iobuf: Rename IOBUF_TEMP to IOBUF_OUTPUT_TEMP.
+ * common/iobuf.h (enum iobuf_use): Rename IOBUF_TEMP to
+ IOBUF_OUTPUT_TEMP. Update users.
+
+ iobuf: Use a first-class enum.
+ * common/iobuf.h (enum iobuf_use): Name the IOBUF_OUTPUT, etc. enum.
+ (struct iobuf_struct): Change the field use's type to it.
+
+ iobuf: Fix test.
+ * common/t-iobuf.c (content_filter): If there is nothing to read,
+ don't forget to set *LEN to 0.
+ (main): Fix checks.
+
+2015-09-01 Werner Koch <wk at gnupg.org>
+
+ agent: Protect commit 135b1e3 against misbehaving Libgcrypt.
+ * agent/command-ssh.c (ssh_key_to_blob): Check DATALEN.
+
+ gpg: Remove option --no-sig-create-check.
+ * g10/gpg.c (opts): Remove --no-sig-create-check.
+ * g10/options.h (struct opt): Remove field no_sig_create_check.
+ * g10/sign.c (do_sign): Always check unless it is RSA and we are using
+ Libgcrypt 1.7.
+
+ common: Assume an utf-8 locale on iconv errors.
+ * common/utf8conv.c (handle_iconv_error): Use utf-8 as fallback.
+
+ common: Fix regression in building argpase.c standalone.
+ * common/argparse.c (is_native_utf8) [GNUPG_MAJOR_VERSION]: New.
+
+2015-08-31 Neal H. Walfield <neal at g10code.com>
+
+ g10: Don't leak memory if we fail to initialize a new database handle.
+ * g10/keydb.c (keydb_new): If we fail to open a keyring or keybox
+ correctly release all resources.
+
+ g10: Improve interface documentation of the keydb API.
+ * g10/keydb.c: Improve code comments and documentation of internal
+ interfaces. Improve documentation of public APIs and move that to...
+ * g10/keydb.h: ... this file.
+
+ g10: Don't cache search results if the search didn't scan the whole DB.
+ * g10/keydb.c (struct keydb_handle): Add new field is_reset.
+ (keydb_new): Initialize hd->is_reset to 1.
+ (keydb_locate_writable): Set hd->is_reset to 1.
+ (keydb_search): Set hd->is_reset to 0. Don't cache a key not found if
+ the search started from the beginning of the database.
+
+ g10: Have keydb_search_first call keydb_search_reset before searching.
+ * g10/keydb.c (keydb_search_first): Reset the handle before starting
+ the search.
+
+ g10: Remove unused parameter.
+ * g10/keydb.h (keydb_locate_writable): Remove unused parameter
+ reserved. Update users.
+
+2015-08-31 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix SSH public key for EdDSA.
+ * agent/command-ssh.c (ssh_key_to_blob): Remove the prefix 0x40.
+
+2015-08-26 Neal H. Walfield <neal at g10code.com>
+
+ g10: Simplify cache. Only include data that is actually used.
+ * g10/keydb.c (struct kid_list_s): Rename from this...
+ (struct kid_not_found_cache_bucket): ... to this. Update users.
+ Remove field state.
+ (kid_list_t): Remove type.
+ (KID_NOT_FOUND_CACHE_BUCKETS): Define. Use this instead of a literal.
+ (kid_found_table): Rename from this...
+ (kid_not_found_cache_bucket): ... to this. Update users.
+ (kid_found_table_count): Rename from this...
+ (kid_not_found_cache_count): ... to this. Update users.
+ (kid_not_found_p): Only return whether a key with the specified key id
+ is definitely not in the database.
+ (kid_not_found_insert): Remove parameter found. Update callers.
+ (keydb_search): Only insert a key id in the not found cache if it is
+ not found. Rename local variable once_found to already_in_cache.
+
+2015-08-25 Werner Koch <wk at gnupg.org>
+
+ Add configure option --enable-build-timestamp.
+ * configure.ac (BUILD_TIMESTAMP): Set to "<none>" by default.
+
+ gpg: Emit ERROR status for key signing failures.
+ * g10/keyedit.c (sign_uids): Write an ERROR status for a signing
+ failure.
+ (menu_adduid, menu_addrevoker, menu_revsig): Ditto.
+ (menu_revuid, menu_revkey, menu_revsubkey): Ditto.
+
+ gpg: Print a new FAILURE status after most commands.
+ * common/status.h (STATUS_FAILURE): New.
+ * g10/cpr.c (write_status_failure): New.
+ * g10/gpg.c (main): Call write_status_failure for all commands which
+ print an error message here.
+ * g10/call-agent.c (start_agent): Print an STATUS_ERROR if we can't
+ set the pinentry mode.
+
+2015-08-24 Neal H. Walfield <neal at g10code.com>
+
+ agent: Raise the maximum password length. Don't hard code it.
+ * agent/agent.h (MAX_PASSPHRASE_LEN): Define.
+ * agent/command-ssh.c (ssh_identity_register): Use it instead of a
+ hard-coded literal.
+ * agent/cvt-openpgp.c (convert_from_openpgp_main): Likewise.
+ * agent/findkey.c (unprotect): Likewise.
+ * agent/genkey.c (agent_ask_new_passphrase): Likewise.
+
+2015-08-24 Werner Koch <wk at gnupg.org>
+
+ sm: Support secret key export via the Assuan interface.
+ * sm/server.c (cmd_export): Add options --secret, --raw, and --pkcs12.
+
+2015-08-23 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Allow sending of Zack's key.
+ * dirmngr/server.c (MAX_KEYBLOCK_LENGTH): Increase to 1 MiB.
+
+ gpg: Fix regression in packet parser from Aug 19.
+ * g10/parse-packet.c (parse): Use an int to compare to -1. Use
+ buf32_to_ulong.
+
+ gpg: Show not found keys with --locate-key --verbose.
+ * g10/keylist.c (locate_one): Print a diagnostic for a not-found key.
+
+2015-08-21 Neal H. Walfield <neal at g10code.com>
+
+ common: Don't incorrectly reject 4 GB - 1 sized packets.
+ * g10/parse-packet.c (parse): Don't reject 4 GB - 1 sized packets.
+ Add the constraint that the type must be 63.
+ * kbx/keybox-openpgp.c (next_packet): Likewise.
+ * tests/openpgp/4gb-packet.asc: New file.
+ * tests/openpgp/4gb-packet.test: New file.
+ * tests/openpgp/Makefile.am (TESTS): Add 4gb-packet.test.
+ (TEST_FILES): Add 4gb-packet.asc.
+
+ common: Don't assume on-disk layout matches in-memory layout.
+ * g10/packet.h (PKT_signature): Change revkey's type from a struct
+ revocation_key ** to a struct revocation_key *. Update users.
+
+ common: Don't incorrectly copy packets with partial lengths.
+ * g10/parse-packet.c (parse): We don't handle copying packets with a
+ partial body length to an output stream. If this occurs, log an error
+ and abort.
+
+ common: Check parameters more rigorously.
+ * g10/parse-packet.c (dbg_copy_all_packets): Check that OUT is not
+ NULL.
+ (copy_all_packets): Likewise.
+
+ common: Don't continuing processing on error.
+ * g10/parse-packet.c (dbg_parse_packet): Also return if parse returns
+ an error.
+ (parse_packet): Likewise.
+ (dbg_search_packet): Likewise.
+ (search_packet): Likewise.
+
+ common: Better respect the packet's length when reading it.
+ * g10/parse-packet.c (parse_signature): Make sure PKTLEN doesn't
+ underflow. Be more careful that a read doesn't read more data than
+ PKTLEN says is available.
+
+2015-08-20 Werner Koch <wk at gnupg.org>
+
+ po: Add lost translation of validity strings.
+ * po/POTFILES.in (trust.c): Add missing file.
+ * po/de.po: Changed German validity strings.
+ * doc/help.de.txt: Ditto.
+
+2015-08-20 Neal H. Walfield <neal at g10code.com>
+
+ g10/parse-packet.c:parse: Try harder to not ignore an EOF.
+ * g10/parse-packet.c (parse): Be more robust: make sure to process any
+ EOF.
+
+ g10/parse-packet.c: Replace literal with symbolic expression.
+ * g10/parse-packet.c (dump_hex_line): Use sizeof rather than the
+ buffer's size.
+
+ Add documentation for g10/parse-packet.c.
+ * g10/packet.h: Add documentation for functions defined in
+ parse-packet.c.
+ * g10/parse-packet.c: Improve comments for many functions.
+
+ g10/packet.h: Remove unused argument from enum_sig_subpkt.
+ * g10/packet.h (enum_sig_subpkt): Remove argument RET_N. Update
+ callers.
+ * g10/parse-packet.c (enum_sig_subpkt): Remove argument RET_N.
+
+ g10/parse-packet.c:mpi_read: Detect EOF and correct boundary conditions.
+ * g10/parse-packet.c (mpi_read): Improve documentation. Correctly
+ handle an EOF. On overflow, correctly return the number of bytes read
+ from the pipeline.
+
+ common/iobuf.c: Make control flow more obvious.
+ * common/iobuf.c (iobuf_read): Make control flow more obvious.
+ (iobuf_get_filelength): Likewise.
+ (iobuf_get_fd): Likewise.
+ (iobuf_seek): Likewise.
+
+ common/iobuf.c: Add some sanity checks to catch programmer bugs.
+ * common/iobuf.c (iobuf_alloc): Check that BUFSIZE is not 0.
+ (iobuf_readbyte): Check that A is an input filter. Check that the
+ amount of read data is at most the amount of buffered data.
+ (iobuf_read): Check that A is an input filter.
+ (iobuf_writebyte): Check that A is not an input filter.
+ (iobuf_writestr): Check that A is not an input filter.
+ (iobuf_flush_temp): Check that A is not an input filter.
+
+ common/iobuf.c:iobuf_write_temp: Elide redundant code.
+ * common/iobuf.c (iobuf_write_temp): Don't repeat iobuf_flush_temp.
+ Use it directly.
+
+ common/iobuf.c: Have iobuf_writestr use iobuf_write, not iobuf_writebyte
+ * common/iobuf.c (iobuf_write): Don't write a byte at a time. Use
+ iobuf_write.
+
+ common/iobuf: Improve documentation and code comments.
+ common/iobuf.h: Improve documentation and code comments.
+ common/iobuf.c: Likewise.
+
+ common/iobuf.c: Adjust buffer size of filters in front of temp filters.
+ * common/iobuf.c (iobuf_push_filter2): If the head filter is a temp
+ filter, use IOBUF_BUFFER_SIZE for the new filter.
+
+ common/iobuf.c: Buffered data should not be processed by new filters.
+ * common/iobuf.c (iobuf_push_filter2): If the pipeline is an output or
+ temp pipeline, the new filter shouldn't assume ownership of the old
+ head's internal buffer: the data was written before the filter was
+ added.
+ * common/t-iobuf.c (double_filter): New function.
+ (main): Add test cases for the above bug.
+
+ common/iobuf.c: Flush the pipeline in iobuf_temp_to_buffer.
+ * common/iobuf.c (iobuf_temp_to_buffer): Flush each filter in the
+ pipeline and copy the data from the last (not the first) filter's
+ internal buffer.
+
+ common/iobuf.c: Combine iobuf_open, iobuf_create and iobuf_openrw.
+ * common/iobuf.c (do_open): New function, which is a generalization of
+ iobuf_open, iobuf_Create, iobuf_openrw.
+ (iobuf_open): Call do_open.
+ (iobuf_create): Likewise.
+ (iobuf_openrw): Likewise.
+
+ common/iobuf.h: Remove iobuf_open_fd_or_name.
+ * common/iobuf.h (iobuf_open_fd_or_name): Remove prototype. Replace
+ use with either iobuf_open or iobuf_fdopen_nc, as appropriate.
+ * common/iobuf.c (iobuf_open): Remove function.
+
+ common/iobuf.c: Rename iobuf_flush and make it a static function.
+ * common/iobuf.h (iobuf_flush): Remove prototype.
+ * common/iobuf.c (filter_flush): New static prototype.
+ (iobuf_flush): Rename...
+ (filter_flush): ... to this. Make static. Simplify code. Update
+ callers.
+
+ common/iobuf.c: Don't abort freeing a pipeline if freeing a filter fails
+ * common/iobuf.c (iobuf_cancel): Don't abort freeing a pipeline if
+ freeing a filter fails. This needs to a memory leak. Instead, keep
+ freeing and return the error code of the first filter that fails.
+
+ common/iobuf.c: Improve iobuf_peek.
+ * common/iobuf.c (underflow): Take additional parameter
+ clear_pending_eof. If not set, don't clear a pending eof when
+ returning EOF. Update callers.
+ (iobuf_peek): Fill the internal buffer, if needed, to be able to
+ better satisfy any request.
+
+ common/iobuf.c: When requested, fill the buffer even if it is not empty.
+ * common/iobuf.c (underflow): Don't require that the buffer be empty.
+ When called, fill any available space.
+
+ common/t-iobuf.c: Add a test case for multiple EOFs.
+ common/t-iobuf.c (main): Add a test case for multiple EOFs in an INPUT
+ pipeline.
+
+ common/iobuf.c: Better respect boundary conditions in iobuf_read_line.
+ * common/iobuf.c (iobuf_read_line): Be more careful with boundary
+ conditions.
+ * common/iobuf.h: Include <gpg-error.h>.
+ * common/t-iobuf.c: New file.
+ * common/Makefile.am (module_tests): Add t-iobuf.
+ (t_mbox_util_LDADD): New variable.
+
+ common/iobuf.c: Fix filter type for iobuf_temp_with_content.
+ * common/iobuf.c (iobuf_temp_with_content): Set the filter type to
+ IOBUF_INPUT, not IOBUF_TEMP, which is only for output filters that
+ write into a dynamic buffer.
+
+ common/iobuf.h: Remove unimplemented prototypes.
+ * common/iobuf.h (iobuf_unread): Remove unimplemented prototype.
+ (iobuf_clear_eof): Likewise.
+ (iobuf_append): Likewise.
+
+ common/iobuf.c: Refactor code to not need the desc field.
+ * common/iobuf.h (struct iobuf_struct): Remove field desc.
+ * common/iobuf.c (iobuf_desc): New function. When a filter's
+ description is needed, use this instead of the filter's desc field.
+
+ common/iobuf.h: Clarify semantics of nofast. Simplify implementation.
+ * common/iobuf.h (struct iobuf_struct): Clarify semantics of nofast.
+ Simplify use of nofast to implement just these semantics.
+
+ common/iobuf.c: Remove dead code (directfp).
+ * common/iobuf.h (struct iobuf_struct): Remove field directfp. Remove
+ all uses of it.
+
+ common/iobuf.c: Remove dead code (opaque).
+ * common/iobuf.h (struct iobuf_struct): Remove field opaque. Remove
+ all uses of it.
+
+ common/iobuf.h: Replace further use of literals with symbolic constants.
+ * common/iobuf.c: Move BLOCK_FILTER_INPUT,
+ BLOCK_FILTER_OUTPUT_BLOCK_FILTER_TEMP from here...
+ * common/iobuf.h: ... to here and rename to IOBUF_INPUT, IOBUF_OUTPUT
+ and IOBUF_TEMP, respectively. Where appropriate, use these macros
+ instead of a literal.
+
+2015-08-17 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid linking to Libksba.
+ * kbx/keybox.h (KEYBOX_WITH_X509): Do not define.
+ * sm/Makefile.am (AM_CPPFLAGS): Define it here.
+ (common_libs): Change to libkeybox509.a
+ * g10/Makefile.am (AM_CFLAGS): remove KSBA_CFLAGS.
+ (gpg2_LDADD, gpgv2_LDADD): Remove KSBA_LIBS
+ * kbx/Makefile.am (noinst_LIBRARIES): Add libkeybox509.a.
+ (libkeybox509_a_SOURCES): New.
+ (libkeybox_a_CFLAGS): New.
+ (libkeybox509_a_CFLAGS): New.
+ (kbxutil_CFLAGS): New.
+ * kbx/keybox-search.c (has_keygrip) [!KEYBOX_WITH_X509]: Declare args
+ as unused.
+
+2015-08-16 Ben Kibbey <bjk at luxsci.net>
+
+ Fix pinentry loopback and passphrase contraints.
+ * agent/command.c (cmd_get_passphrase): Don't repeat passphrase for
+ pinentry loopback mode.
+ * agent/genkey.c (check_passphrase_constraints): Immediately return when
+ pinentry mode is loopback.
+
+ Fix sending INQUIRE_MAXLEN for symmetric data.
+ * g10/passphrase.c (passphrase_to_dek_ext): Write the status message.
+
+2015-08-15 Ben Kibbey <bjk at luxsci.net>
+
+ Inform a user about inquire length limit.
+ * common/status.h (INQUIRE_MAXLEN): New.
+ * g10/call-agent.c (default_inquire_cb): Send STATUS_INQUIRE_MAXLEN.
+ client when inquiring a passphrase over pinentry-loopback.
+
+ Allow --gen-key to inquire a passphrase.
+ * g10/gpg.c (main): test for --command-fd during --gen-key parse.
+
+ When --command-fd is set then imply --batch to let gpg inquire a
+ passphrase rather than requiring a pinentry.
+
+2015-08-11 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.7.
+
+2015-08-10 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: fix ECC key handling.
+ * agent/cvt-openpgp.c (get_keygrip, convert_secret_key)
+ (convert_transfer_key): CURVE is the name of curve.
+
+2015-08-08 Neal H. Walfield <neal at g10code.com>
+
+ common/iobuf.c: Replace use of literals with symbolic constants.
+ * common/iobuf.c (BLOCK_FILTER_INPUT): Define. Where appropriate, use
+ this instead of a literal.
+ (BLOCK_FILTER_OUTPUT): Likewise.
+ (BLOCK_FILTER_TEMP): Likewise.
+
+2015-08-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Allow gpgv to work with a trustedkeys.kbx file.
+ * g10/keydb.h (KEYDB_RESOURCE_FLAG_GPGVDEF): New.
+ * g10/keydb.c (keydb_add_resource): Take care of new flag.
+ * g10/gpgv.c (main): Use new flag.
+
+ agent: Add option --force to the DELETE_KEY command.
+ * agent/findkey.c (agent_delete_key): Add arg "force".
+ * agent/command.c (cmd_delete_key): Add option --force.
+
+ common: Change alias for Curve25519 to "cv25519".
+ * common/openpgp-oid.c (oidtable): Change alias.
+
+2015-08-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove duplicated printing of the curve name in "sub" lines.
+ * g10/keylist.c (list_keyblock_print): Do not print extra curve name.
+
+ gpg: Add commands "fpr *" and "grip" to --edit-key.
+ * g10/keyedit.c (cmdGRIP): New.
+ (cmds): Add command "grip".
+ (keyedit_menu) <cmdFPR>: Print subkeys with argument "*".
+ (keyedit_menu) <cmdGRIP>: Print keygrip.
+ (show_key_and_fingerprint): Add arg "with_subkeys".
+ (show_key_and_grip): New.
+ * g10/keylist.c (print_fingerprint): Add mode 4.
+
+ gpg: Adjust UID line indentation for common key algos.
+ * g10/keylist.c (list_keyblock_print): Change UID line indentation
+ * g10/mainproc.c (list_node): Ditto.
+
+2015-08-06 NIIBE Yutaka <gniibe at fsij.org>
+
+ Curve25519 support.
+ * agent/cvt-openpgp.c (get_keygrip): Handle Curve25519.
+ (convert_secret_key, convert_transfer_key): Ditto.
+ * common/openpgp-oid.c (oidtable): Add Curve25519.
+ (oid_crv25519, openpgp_oid_is_crv25519): New.
+ * common/util.h (openpgp_oid_is_crv25519): New.
+ * g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Handle the case
+ with Montgomery curve which uses x-only coordinate.
+ * g10/keygen.c (gen_ecc): Handle Curve25519.
+ (ask_curve): Change the API and second arg is to return subkey algo.
+ (generate_keypair, generate_subkeypair): Follow chage of ask_curve.
+ * g10/keyid.c (keygrip_from_pk): Handle Curve25519.
+ * g10/pkglue.c (pk_encrypt): Handle Curve25519.
+ * g10/pubkey-enc.c (get_it): Handle the case with Montgomery curve.
+ * scd/app-openpgp.c (ECC_FLAG_DJB_TWEAK): New.
+ (send_key_attr): Work with general ECC, Ed25519, and Curve25519.
+ (get_public_key): Likewise.
+ (ecc_writekey): Handle flag_djb_tweak.
+
+ common: extend API of openpgp_oid_to_curve for canonical name.
+ * common/openpgp-oid.c (openpgp_oid_to_curve): Add CANON argument.
+ * common/util.h: Update.
+ * g10/import.c (transfer_secret_keys): Follow the change.
+ * g10/keyid.c (pubkey_string): Likewise.
+ * g10/keylist.c (list_keyblock_print, list_keyblock_colon): Likewise.
+ * parse-packet.c (parse_key): Likewise.
+ * scd/app-openpgp.c (send_key_attr, get_public_key): Likewise.
+
+2015-08-05 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix ecc_oid.
+ * scd/app-openpgp.c (ecc_oid): Call with OIDBUF.
+
+ scd: Fix ECC support.
+ * scd/app-openpgp.c (send_key_attr): Send KEYNO.
+ (get_public_key): Fix SEXP composing.
+ (ecc_writekey): Fix OID length calculation.
+ (ecc_oid): Prepend the length before query.
+ (parse_algorithm_attribute): Handle the case the curve is not available.
+
+2015-08-04 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix duplicate key import due to legacy key in keyring.
+ * g10/keydb.c (keydb_search_fpr): Skip legacy keys.
+
+ gpg: Properly handle legacy keys while looking for a secret key.
+ * g10/getkey.c (have_secret_key_with_kid): Skip legacy keys.
+
+2015-07-31 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix endless loop for expired keys given by fpr.
+ * g10/getkey.c (lookup): Disable keydb caching when continuing a
+ search.
+
+2015-07-29 Werner Koch <wk at gnupg.org>
+
+ gpg: Do not return "Legacy Key" from lookup if a key is expired.
+ * g10/getkey.c (lookup): Map GPG_ERR_LEGACY_KEY.
+
+ gpg: Indicate secret keys and cards in a key-edit listing.
+ * g10/keyedit.c (sign_uids): Add arg "ctrl".
+ (show_key_with_all_names_colon): Ditto.
+ (show_key_with_all_names): Ditto.
+
+ * g10/keyedit.c (show_key_with_all_names): Print key record
+ indicators by checking with gpg-agent.
+ (show_key_with_all_names): Ditto. May now also print sec/sbb.
+
+2015-07-28 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove the edit-key toggle command.
+ * g10/keyedit.c (cmds): Remove helptext from "toggle".
+ (keyedit_menu): Remove "toggle" var and remove the sub/pub check
+ against toggle.
+
+ common,w32: Avoid unused var warning about msgcache.
+ * common/i18n.c (USE_MSGCACHE): New.
+ (msgcache) [!USE_MSGCACHE]: Do not define.
+ (i18n_localegettext): Repalce #if conditions by USE_MSGCACHE.
+
+ w32: Try more places to find an installed Pinentry.
+ * common/homedir.c (get_default_pinentry_name): Re-implement to
+ support several choices for Windows.
+
+2015-07-26 Werner Koch <wk at gnupg.org>
+
+ scd: Fix size_t/unsigned int mismatch.
+ * scd/app-openpgp.c (ecc_writekey): Use extra var n.
+
+ Replace GNUPG_GCC_A_ macros by GPGRT_ATTR_ macros.
+ * common/util.h: Provide replacement for GPGRT_ATTR_ macros when using
+ libgpg-error < 1.20.
+ * common/mischelp.h: Ditto.
+ * common/types.h: Ditto.
+
+2015-07-25 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: support any curves defined by libgcrypt.
+ * g10/call-agent.h (struct agent_card_info_s): Add curve field.
+ * g10/call-agent.c (learn_status_cb): Use curve name.
+ * g10/card-util.c (card_status): Show pubkey name.
+ * scd/app-openpgp.c (struct app_local_s): Record OID and flags.
+ (store_fpr): Use ALGO instead of key type.
+ (send_key_attr): Use curve name instead of OID.
+ (get_public_key): Clean up by OID to curve name.
+ (ecc_writekey): Support any curves in libgcrypt.
+ (do_genkey, do_auth, ): Follow the change.
+ (ecc_oid): New.
+ (parse_algorithm_attribute): Show OID here.
+
+2015-07-23 Peter Wu <peter at lekensteyn.nl>
+
+ build: ignore scissor line for the commit-msg hook.
+ * build-aux/git-hooks/commit-msg: Stop processing more lines when the
+ scissor line is encountered.
+
+2015-07-23 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Format change to specify "rsa2048" for KEY-ATTR.
+ * g10/card-util.c (do_change_keysize): Put "rsa".
+ * scd/app-openpgp.c (change_keyattr, change_keyattr_from_string):
+ Change the command format.
+ (rsa_writekey): Check key type.
+ (do_writekey): Remove "ecdh" and "ecdsa" support which was available
+ in experimental libgcrypt before 1.6.0.
+
+2015-07-22 Werner Koch <wk at gnupg.org>
+
+ Avoid a leading double slash in make_filename.
+ * common/stringhelp.c (do_make_filename): Special case leading '/'.
+
+2015-07-21 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: change_keyattr_from_string for ECC.
+ * scd/app-openpgp.c (change_keyattr, change_keyattr_from_string):
+ Support ECC.
+ (rsa_writekey): Don't change key attribute.
+
+2015-07-17 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Use openpgpdefs.h for constants.
+ * scd/app-openpgp.c: Include openpgpdefs.h.
+
+2015-07-16 Neal H. Walfield <neal at g10code.com>
+
+ Don't segfault if the first 'auto-key-locate' option is 'clear'.
+ * g10/getkey.c (free_akl): If AKL is NULL, just return.
+
+2015-07-10 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Support non-NLS build.
+ * agent/agent.h: Use ENABLE_NLS and define L_() macro.
+
+2015-07-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Remove unused files.
+ * scd/Makefile.am (sc_copykeys_*): Remove.
+ * scd/sc-copykeys.c: Remove.
+ * scd/pcsc-wrapper.c: Remove.
+ * scd/{card-common.h,card-dinsig.c,card-p15.c,card.c}: Remove.
+
+2015-07-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Use canonical name for curve.
+ * g10/import.c (transfer_secret_keys): Use canonical name.
+ * common/openpgp-oid.c (openpgp_curve_to_oid): Return NULL on error.
+ * g10/keyid.c (pubkey_string): Follow change of openpgp_curve_to_oid.
+ * g10/keylist.c (list_keyblock_print, list_keyblock_colon): Ditto.
+ * g10/parse-packet.c (parse_key): Ditto.
+
+2015-07-03 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ drop long-deprecated gpgsm-gencert.sh.
+ * tools/gpgsm-gencert.sh: remove deprecated script entirely. It is
+ fully replaced by gpgsm --gen-key
+ * doc/tools.texi: remove gpgsm-gencert.sh documentation
+ * .gitignore: no longer ignore gpgsm-gencert.sh manpage
+ * doc/Makefile.am: quit making the manpage
+ * tools/Makefile.am: quit distributing the script
+ * doc/howto-create-a-server-cert.texi: overhaul documentation to use
+ gpgsm --gen-key and tweak explanations
+
+2015-07-02 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+ scd: Support AES decryption for OpenPGPcard v3.0.
+ * scd/app-openpgp.c (do_decipher): Support AES decryption.
+
+2015-07-01 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.6.
+
+2015-07-01 Daiki Ueno <ueno at gnu.org>
+
+ agent: Unset INSIDE_EMACS on gpg-agent startup.
+ * agent/gpg-agent.c (main): Unset INSIDE_EMACS envvar.
+
+2015-07-01 Werner Koch <wk at gnupg.org>
+
+ common: Implement i18n_localegettext.
+ * common/i18n.c (msg_cache_s, msg_cache_head_s): New.
+ (msgcache): New.
+ (i18n_localegettext): Implement locale dependent lookup.
+
+2015-06-30 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ Pass DBUS_SESSION_BUS_ADDRESS for gnome3.
+ * common/session-env.c (stdenvnames): Add DBUS_SESSION_BUS_ADDRESS.
+
+2015-06-30 Werner Koch <wk at gnupg.org>
+
+ Flag the L_() function with attribute format_arg.
+ * agent/agent.h (LunderscorePROTO): New.
+ * common/util.h (GNUPG_GCC_ATTR_FORMAT_ARG): New.
+ * common/i18n.h (GNUPG_GCC_ATTR_FORMAT_ARG): New. Use for
+ i18n_localegettext. Expand LunderscorePROTO.
+ * agent/genkey.c (check_passphrase_constraints): Use xtryasprintf
+ again to keep the old translations.
+
+ agent: Use different translation func for Pinentry strings.
+ * po/Makevars (XGETTEXT_OPTIONS): Add keyword "L_".
+ * common/i18n.c (i18n_localegettext): New stub.
+ * common/i18n.h: Expand the LunderscoreIMPL macro.
+ * agent/agent.h (L_): New.
+ (LunderscoreIMPL): New.
+ * agent/call-pinentry.c (setup_qualitybar): Add arg ctrl anc change
+ caller.
+ * agent/findkey.c (try_unprotect_cb): Add local var ctrl.
+ * agent/genkey.c (check_passphrase_constraints): Replace xtryasprintf
+ by xtrystrdup to avoid gcc warning. Unfortinately this changes the
+ string.
+ (agent_ask_new_passphrase): Cleanup the use of initial_errtext.
+
+ gpg: Make show-sig-subpackets work again.
+ * g10/gpg.c (parse_list_options): Fix offset for subpackets.
+
+2015-06-29 Werner Koch <wk at gnupg.org>
+
+ agent: Prepare for Libassuan with Cygwin support.
+ * agent/gpg-agent.c (create_server_socket): Add arg "cygwin". Call
+ assuan_sock_set_flag if Assuan version is recent enough.
+ (main): Create ssh server socket with Cygwin flag set.
+
+2015-06-29 Neal H. Walfield <neal at gnu.org>
+
+ Show passphrase constraints errors as password prompt errors.
+ * agent/agent.h (check_passphrase_constraints): Add parameter
+ failed_constraint and remove parameter silent. Update callers.
+ * agent/genkey.c (check_passphrase_constraints): Add parameter
+ failed_constraint and remove parameter silent. If FAILED_CONSTRAINT
+ is not NULL and OPT.ENFORCE_PASSPHRASE_CONSTRAINTS is FALSE, save the
+ error text in *FAILED_CONSTRAINT and don't call take_this_one_anyway
+ or take_this_one_anyway2. If FAILED_CONSTRAINT is NULL, act as if
+ SILENT was set.
+ (agent_ask_new_passphrase): Change initial_errtext's type from a const
+ char * to a char *. Pass it to check_passphrase_constraints. If it
+ contains malloc's memory, free it.
+
+2015-06-29 Neal H. Walfield <neal at g10code.com>
+
+ Improve documentation for default-cache-ttl and default-cache-ttl-ssh.
+ * doc/gpg-agent.texi (Agent Options): Improve documentation for
+ default-cache-ttl and default-cache-ttl-ssh.
+
+ Don't raise max-cache-ttl to default-cache-ttl.
+ * agent/gpg-agent.c (finalize_rereadable_options): Don't raise
+ max-cache-ttl to default-cache-ttl. Likewise for max-cache-ttl-ssh
+ and default-cache-ttl-ssh.
+
+ Improve the description of old packets with an indeterminate length.
+ * g10/parse-packet.c (parse): Make the description more accurate when
+ listing packets: old format packets don't support partial lengths,
+ only indeterminate lengths (RFC 4880, Section 4.2).
+
+2015-06-29 Werner Koch <wk at gnupg.org>
+
+ agent: Add --verify to the PASSWD command.
+ * agent/command.c (cmd_passwd): Add option --verify.
+
+ agent,w32: Do not create a useless socket with --enable-putty-support.
+ * agent/agent.h (opt): Remove field ssh_support.
+ * agent/gpg-agent.c (ssh_support): New. Replace all opt.ssh_support
+ by this.
+ (main): Do not set ssh_support along with setting putty_support.
+
+ gpgsm: Add command option "offline".
+ * sm/server.c (option_handler): Add "offline".
+ (cmd_getinfo): Ditto.
+ * sm/certchain.c (is_cert_still_valid):
+ (do_validate_chain):
+ * sm/gpgsm.c (gpgsm_init_default_ctrl): Default "offline" to the value
+ of --disable-dirmngr.
+ * sm/call-dirmngr.c (start_dirmngr_ext): Better also check for
+ ctrl->offline.
+
+2015-06-26 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Support button flag and AES key data for OpenPGPcard v3.0.
+ * scd/app-openpgp.c (do_getattr, show_caps, app_select_openpgp):
+ Support button and symmetric decryption.
+ (do_setattr): Support setting AESKEY.
+
+2015-06-25 Andre Heinecke <aheinecke at intevation.de>
+
+ sm: Fix cert storage for ephemeral certs.
+ * sm/keydb.c (keydb_store_cert): Clear ephemeral flag for
+ existing certs if store should not be ephemeral.
+
+2015-06-23 Werner Koch <wk at gnupg.org>
+
+ Allow use of debug flag names for all tools.
+ * g13/g13.c: Make use of debug_parse_flag.
+ * scd/scdaemon.c: Ditto.
+ * sm/gpgsm.c: Ditto
+ * agent/gpg-agent.c: Ditto. But do not terminate on "help"
+ * dirmngr/dirmngr.c: Ditto.
+
+ common: Improve fucntion parse_debug_flag.
+ * common/miscellaneous.c (parse_debug_flag): Add hack not to call
+ exit. Add "none" and "all" flags.
+
+2015-06-23 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: pinpad workaround for PC/SC implementations.
+ * scd/adpu.c (pcsc_pinpad_verify, pcsc_pinpad_modify): Bigger buffer
+ for TPDU card reader.
+
+2015-06-22 Werner Koch <wk at gnupg.org>
+
+ gpg: Allow debug flag names for --debug.
+ * g10/gpg.c (opts): Change arg for oDebug to a string.
+ (debug_flags): New; factored out from set_debug.
+ (set_debug): Remove "--debug-level help". Use parse_debug_flag to
+ print the used flags.
+ (main): Use parse_debug_flag for oDebug.
+
+ common: Add function parse_debug_flag.
+ * common/miscellaneous.c (parse_debug_flag): New.
+ * common/util.h (struct debug_flags_s): New.
+
+ common: Add function strtokenize.
+ * common/stringhelp.c: Include assert.h.
+ (strtokenize): New.
+ * common/t-stringhelp.c (test_strtokenize): New.
+
+ gpg: Fix regression due to recent commit 6500f33.
+ * g10/keydb.c (kid_list_s): Keep a state in the table.
+ (kid_not_found_table): Rename to kid_found_table.
+ (n_kid_not_found_table): Rename to kid_found_table_count.
+ (kid_not_found_p): Return found state.
+ (kid_not_found_insert): Add arg found.
+ (keydb_search): Store found state in the table.
+
+2015-06-22 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix Cherry ST-2000 support for pinpad input.
+ * scd/apdu.c (pcsc_vendor_specific_init): Set pinmax to 15.
+ * scd/ccid-driver.c (ccid_transceive_secure): Add zero for the
+ template of APDU.
+
+2015-06-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Print number of good signatures with --check-sigs.
+ * g10/keylist.c (keylist_context): Add field good_sigs.
+ (list_keyblock_print): Updated good_sigs.
+ (print_signature_stats): Print number of good signatures and use
+ log_info instead of tty_printf.
+
+ gpg: Improve speed of --check-sigs and --lish-sigs.
+ * g10/keydb.c (kid_list_t): New.
+ (kid_not_found_table, n_kid_not_found_table): New.
+ (kid_not_found_p, kid_not_found_insert, kid_not_found_flush): New.
+ (keydb_insert_keyblock): Flush the new cache.
+ (keydb_delete_keyblock): Ditto.
+ (keydb_update_keyblock): Ditto.
+ (keydb_search): Use the new cache.
+ (keydb_dump_stats): New.
+ * g10/gpg.c (g10_exit): Dump keydb stats.
+
+2015-06-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Add more log_clock calls to keydb.c.
+ * g10/keydb.c (keydb_get_keyblock): Add log_clock calls.
+
+ gpg: Print available debug flags using "--debug-level help".
+ * g10/gpg.c (set_debug): Add "help" option and use a table for the
+ flags.
+
+ gpg: Fix export problem in case an old keyring has PGP-2 keys.
+ * g10/export.c (do_export_stream): Skip legacy keys.
+
+2015-06-18 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix the cleanup zombies fix (685b782).
+ * dirmngr/ldap-wrapper.c (ldap_wrapper_thread): Do not close the
+ stdout reader after EOF from read_log_data.
+ * dirmngr/crlcache.c (crl_cache_reload_crl): Close the reader before
+ the next iteration.
+
+2015-06-17 Werner Koch <wk at gnupg.org>
+
+ agent: Print a warning for obsolete options.
+ * g10/misc.c (obsolete_scdaemon_option): Move to
+ * common/miscellaneous.c (obsolete_option): ... here.
+ * agent/gpg-agent.c (main): Use obsolete_option for the 3 obsolete
+ options.
+
+2015-06-16 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Cleanup zombies and fix hang on shutdown.
+ * dirmngr/ldap-wrapper.c (ldap_wrapper_thread): Move nfds computation
+ into the loop. Check the queue also on timeout. Close log_fd and
+ reader context on EOF or error.
+
+ dirmngr: Avoid accessing uninitialized memory in log callback.
+ * dirmngr/dirmngr.c (pid_suffix_callback): Clear int_and_ptr_u before
+ use.
+ (start_connection_thread): Ditto.
+ (handle_connections): Ditto.
+
+2015-06-16 Neal H. Walfield <neal at g10code.com>
+
+ Don't prompt for the password multiple times in pinentry loopback mode.
+ * g10/gpg.c (main): If OPT.PINENTRY_MODE is PINENTRY_MODE_LOOPBACK,
+ clear OPT.PASSPHRASE_REPEAT.
+
+2015-06-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese Translation.
+
+2015-06-15 Werner Koch <wk at gnupg.org>
+
+ doc: Add defs.inc to BUILT_SOURCES.
+
+2015-06-11 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.5.
+
+ agent: Fix --extra-socket on Windows.
+ * agent/gpg-agent.c (start_connection_thread): Rename to ...
+ (do_start_connection_thread): this. Factor nonce checking out to ...
+ (start_connection_thread_std): this,
+ (start_connection_thread_extra): this,
+ (start_connection_thread_browser): and this.
+
+ agent: Add experimental option --browser-socket.
+ * agent/agent.h (opt): Add field "browser_socket".
+ * agent/command.c (cmd_setkeydesc): Use a different message for
+ restricted==2.
+ * agent/gpg-agent.c (oBrowserSocket): New.
+ (opts): Add --browser-socket.
+ (socket_name_browser, redir_socket_name_browser): New.
+ (socket_nonce_browser): New.
+ (cleanup): Cleanup browser socket.
+ (main): Implement option.
+ (start_connection_thread_browser): New.
+ (handle_connections): Add arg listen_fd_browser and use it.
+
+2015-06-10 Daiki Ueno <ueno at gnu.org>
+
+ agent: Add option --allow-emacs-pinentry.
+ * agent/agent.h (opt): Add field allow_emacs_pinentry.
+ * agent/call-pinentry.c (start_pinentry): Act upon new var.
+ * agent/gpg-agent.c (oAllowEmacsPinentry): New.
+ (opts): Add option --allow-emacs-pinentry.
+ (parse_rereadable_options): Set this option.
+ * tools/gpgconf-comp.c (gc_options_gpg_agent): Add new option.
+
+2015-06-09 Werner Koch <wk at gnupg.org>
+
+ doc: Do not used fixed file names in the manuals.
+ * doc/mkdefsinc.c: New.
+ * doc/Makefile.am: Include cmacros.am.
+ (EXTRA_DIST): Add mkdefsinc.c defsincdate.
+ (BUILT_SOURCES): Add defsincdate
+ (CLEANFILES): Add mkdefsinc and defs.inc.
+ (mkdefsinc): New rule.
+ (yat2m-stamp): Depend on defs.inc.
+ ($(myman_pages) gnupg.7): Ditto.
+ (gnupg.texi): Remove rule to touch itself.
+ (dist-hook): New.
+ (defsincdate): New.
+ (defs.inc): New.
+ * doc/gnupg.texi: Remove inclusion of version.texi. Include defs.inc.
+ Also include defs.inc in all files used to build man files. Change
+ fixed directory names to those from defs.inc.
+
+ dirmngr: Avoid crash due to an empty crls.d/DIR.txt.
+ * dirmngr/crlcache.c (check_dir_version): Avoid segv.
+
+2015-06-08 Werner Koch <wk at gnupg.org>
+
+ doc: Change the manual source to be only for GnuPG 2.1.
+
+ Convey envvar INSIDE_EMACS to the pinentry.
+ * common/session-env.c (stdenvnames): Add it.
+
+ agent: Add command "getinfo std_env_names".
+ * agent/command.c (cmd_getinfo): Add new sub-command.
+
+2015-06-05 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: do_decipher change for OpenPGPcard v3.0.
+ * scd/app-openpgp.c (do_decipher): Add a header for ECDH.
+
+2015-06-04 Werner Koch <wk at gnupg.org>
+
+ gpg: Replace -1 by GPG_ERR_NOT_FOUND in tdbio.c.
+ * g10/tdbio.c (lookup_hashtable): Return GPG_ERR_NOT_FOUND.
+ * g10/tdbdump.c (import_ownertrust): Test for GPG_ERR_NOT_FOUND.
+ * g10/trustdb.c (read_trust_record): Ditto.
+ (tdb_get_ownertrust, tdb_get_min_ownertrust): Ditto.
+ (tdb_update_ownertrust, update_min_ownertrust): Ditto.
+ (tdb_clear_ownertrusts, update_validity): Ditto.
+ (tdb_cache_disabled_value): Ditto.
+
+ gpg: Cleanup error code path in case of a bad trustdb.
+ * g10/tdbio.c (tdbio_read_record): Fix returning of the error.
+
+ gpg: Fix output in case of a corrupted trustdb.
+ * g10/tdbdump.c (list_trustdb): Add arg FP and change callers to pass
+ es_stdout.
+ * g10/tdbio.c (upd_hashtable): On a corrupted trustdb call
+ list_trustdb only in verbose > 1 mode and let it dump to stderr.
+
+2015-05-29 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix key template of ECC.
+ * scd/app-openpgp.c (build_ecc_privkey_template): Use correct value.
+
+2015-05-28 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Fix a race condition initially creating trustdb.
+ * g10/tdbio.c (take_write_lock, release_write_lock): New.
+ (put_record_into_cache, tdbio_sync, tdbio_end_transaction): Use
+ new lock functions.
+ (tdbio_set_dbname): Fix the race.
+ (open_db): Don't call dotlock_create.
+
+2015-05-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Remove g10/signal.c.
+ * g10/signal.c: Remove.
+ * g10/main.h: Remove old function API.
+ * g10/tdbio.c: Use new API, even in the dead code.
+
+2015-05-20 Werner Koch <wk at gnupg.org>
+
+ agent: Cleanup caching code for command GET_PASSPHRASE.
+ * agent/command.c (cmd_get_passphrase): Read from the user cache.
+
+2015-05-19 Neal H. Walfield <neal at g10code.com>
+
+ agent: When the password cache is cleared, also clear the ext. cache.
+ * agent/agent.h (agent_clear_passphrase): New declaration.
+ * agent/call-pinentry.c (agent_clear_passphrase): New function.
+ * agent/command.c (cmd_clear_passphrase): Call agent_clear_passphrase.
+
+ agent: Modify agent_clear_passphrase to support an ext. password cache.
+ * agent/agent.h (agent_get_passphrase): Add arguments keyinfo and
+ cache_mode. Update callers.
+ * agent/call-pinentry.c (agent_get_passphrase): Add arguments keyinfo
+ and cache_mode. If KEYINFO and CACHE_MODE describe a cachable key,
+ then send SETKEYINFO to the pinentry.
+
+2015-05-19 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: detects public key encryption packet error properly.
+ g10/mainproc.c (proc_pubkey_enc): Only allow relevant algorithms for
+ encryption.
+
+2015-05-15 Werner Koch <wk at gnupg.org>
+
+ build: Make --disable-gpgsm work.
+ * Makefile.am: Always build kbx/
+ * g10/Makefile.am (AM_CFLAGS): Include KSBA_CFLAGS.
+
+2015-05-12 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.4.
+
+ speedo: Add make option SELFCHECK=0 to build a new release.
+ * build-aux/getswdb.sh: Add option --skip-selfcheck.
+ * build-aux/speedo.mk: Add option SELFCHECK.
+
+2015-05-11 Werner Koch <wk at gnupg.org>
+
+ common: Cope with AIX problem on number of open files.
+ * common/exechelp-posix.c: Limit returned value for too hight values.
+
+ gpg-connect-agent: Fix quoting of internal percent+ function.
+ * tools/gpg-connect-agent.c (get_var_ext) <percent, percent+): Also
+ escape '+'.
+
+ agent: Add option --no-allow-external-cache.
+ * agent/agent.h (opt): Add field allow_external_cache.
+ * agent/call-pinentry.c (start_pinentry): Act upon new var.
+ * agent/gpg-agent.c (oNoAllowExternalCache): New.
+ (opts): Add option --no-allow-external-cache.
+ (parse_rereadable_options): Set this option.
+
+ agent: Add strings for use by future Pinentry versions.
+ * agent/call-pinentry.c (start_pinentry): Add more strings.
+
+ agent: Add option --debug-pinentry.
+ * agent/gpg-agent.c (oDebugPinentry): New.
+ (opts): Add --debug-pinentry.
+ (parse_rereadable_options): Set that option.
+ * agent/call-pinentry.c (start_pinentry): Pass option to
+ assuan_set_flag.
+
+2015-05-08 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid cluttering stdout with trustdb info in verbose mode.
+ * g10/trustdb.c (validate_keys): Call dump_key_array only in debug
+ mode.
+
+ gpg: Fix wrong output in list mode.
+ * g10/parse-packet.c (parse_gpg_control): Replace puts by es_fputs to
+ LISTFP.
+
+ gpg: New command --quick-adduid.
+ * g10/keygen.c (ask_user_id): Factor some code out to ...
+ (uid_already_in_keyblock): new.
+ (generate_user_id): Add arg UIDSTR. Fix leaked P.
+ * g10/keyedit.c (menu_adduid): Add new arg uidstring. Adjust caller.
+ (keyedit_quick_adduid): New.
+ * g10/gpg.c (aQuickAddUid): New.
+ (opts): Add command --quick-adduid.
+ (main): Implement that.
+
+ gpg: Add push/pop found state feature to keydb.
+ * g10/keydb.c (keydb_handle): Add field saved_found.
+ (keydb_new): Init new field.
+ (keydb_push_found_state, keydb_pop_found_state): New.
+ * g10/keyring.c (kyring_handle): Add field saved_found.
+ (keyring_push_found_state, keyring_pop_found_state): New.
+
+ gpg: Minor code merging in keyedit.
+ * g10/keyedit.c (fix_keyblock): Rename to fix_key_signature_order.
+ (fix_keyblock): New. Call fix_key_signature_order and other fix
+ functions.
+ (keyedit_menu): Factor code out to new fix_keyblock.
+ (keyedit_quick_sign): Ditto. Check for primary fpr before calling
+ fix_keyblock.
+
+2015-05-07 Werner Koch <wk at gnupg.org>
+
+ agent: Minor change for 56b5c9f.
+ * agent/call-pinentry.c (agent_askpin): Move option setting to ...
+ (start_pinentry): here. Fix error code check.
+
+2015-05-07 Kristian Fiskerstrand <kf at sumptuouscapital.com>
+
+ dirmngr: Fix segfault in ldap engine.
+ (ks-engine-ldap.c) Fix segfault caused by missing check whether uri is
+ initialized
+
+2015-05-07 Neal H. Walfield <neal at g10code.com>
+
+ agent: Improve support for externally cached passwords.
+ * agent/call-pinentry.c (PINENTRY_STATUS_PASSWORD_FROM_CACHE): New
+ constant.
+ (pinentry_status_cb): Add it to *FLAGS if PASSWORD_FROM_CACHE was
+ provided.
+ (agent_askpin): Pass "OPTION allow-external-password-cache" to the
+ pinentry. Always pass SETKEYINFO to the pinentry. If there is no
+ stable identifier, then use "--clear". If the password is incorrect
+ and PINENTRY_STATUS_PASSWORD_FROM_CACHE is set in *PINENTRY_STATUS,
+ then decrement PININFO->FAILED_TRIES.
+
+ agent: Or in the value; don't overwrite the variable.
+ * agent/call-pinentry.c (pinentry_status_cb): Or in
+ PINENTRY_STATUS_CLOSE_BUTTON; don't overwrite *FLAG.
+
+ agent: Avoid magic numbers. Use more accurate names.
+ * agent/call-pinentry.c (PINENTRY_STATUS_CLOSE_BUTTON): New constant.
+ (PINENTRY_STATUS_PIN_REPEATED): Likewise.
+ (close_button_status_cb): Rename from this...
+ (pinentry_status_cb): ... to this. Use the constants.
+ (agent_askpin): Rename local variable from close_button to
+ pinentry_status. Use symbolic constants rather than magic numbers.
+
+2015-05-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve 'General key info' line of --card-status.
+ * g10/keylist.c (print_pubkey_info): Print either "pub" or "sub".
+
+ * g10/getkey.c (get_pubkey_byfprint): Add optional arg R_KEYBLOCK.
+ * g10/keyid.c (keyid_from_fingerprint): Adjust for change.
+ * g10/revoke.c (gen_desig_revoke): Adjust for change.
+ * g10/card-util.c (card_status): Simplify by using new arg. Align
+ card-no string.
+
+ * g10/card-util.c (card_status): Remove not used GnuPG-1 code.
+
+ gpg: Fix regression not displaying the card serial number.
+ * g10/call-agent.c (keyinfo_status_cb): Detect KEYINFO.
+
+2015-05-06 Werner Koch <wk at gnupg.org>
+
+ speedo,w32: Install a native pinentry.
+ * build-aux/speedo.mk: Always build pinentry for w32.
+ (speedo_pkg_pinentry_configure): Adjust to modern pinentry.
+ * build-aux/speedo/w32/inst.nsi: Install native pinentry under the
+ name pinentry-basic.exe.
+
+2015-05-01 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: fix cmp_public_key.
+ * g10/free-packet.c (cmp_public_keys): Compare opaque
+ data at the first entry of the array when it's unknown algo.
+
+2015-04-30 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: PC/SC reader selection by partial string match.
+ * scd/apdu.c (open_pcsc_reader_direct): Partial string match.
+
+2015-04-24 Werner Koch <wk at gnupg.org>
+
+ common: Remove JNLIB from boiler plate (jnlib merge).
+ * common/README.jnlib: Remove.
+
+ common: Rename log and gcc attribute macros (jnlib merge).
+ * common/logging.h: Rename JNLIB_LOG_* to GPGRT_LOG_*.
+ * common/mischelp.h: Rename JNLIB_GCC_* to GPGRT_GCC_*.
+
+ common: Remove two JNLIB_ macros (jnlib merge).
+ * configure.ac: Merge seperate jnlib checks.
+ (HAVE_JNLIB_LOGGING): Remove.
+ * common/logging.c, common/simple-pwquery.c (JNLIB_NEED_AFLOCAL):
+ Rename to GNUPG_COMMON_NEED_AFLOCAL. Change all tests.
+
+ common: Remove libjnlib-config.h (jnlib merge).
+ * common/libjnlib-config.h: Remove.
+ * common/common-defs.h (getenv) [HAVE_GETENV]: New. From removed
+ header.
+ (getpid) [HAVE_W32CE_SYSTEM]: New. From removed header.
+ * common/argparse.c: Include util.h and common-defs.h. Replace
+ jnlib_ macro names for non-GNUPG builds by x* names.
+ * common/dotlock.c: Ditto.
+ * common/logging.c: Include util.h and common-defs.h. Replace jnlib_
+ symbol names by x* names.
+ * common/strlist.c: Ditto.
+ * common/utf8conv.c: Ditto.
+ * common/w32-reg.c: Ditto.
+ * common/mischelp.c: Ditto. Also remove _jnlib_free.
+ * common/stringhelp.c: Ditto.
+ (JNLIB_LOG_WITH_PREFIX): Do not depend on this macro.
+ * common/logging.h (JNLIB_LOG_WITH_PREFIX): Do not depend on this
+ macro.
+
+2015-04-23 Werner Koch <wk at gnupg.org>
+
+ gpg: Move all DNS access to Dirmngr.
+ * common/dns-cert.h: Move to ../dirmngr/.
+ * common/dns-cert.c: Move to ../dirmngr/. Change args to return the
+ key as a buffer.
+ * common/t-dns-cert.c: Move to ../dirmngr/.
+ * common/pka.c, common/pka.h, common/t-pka.c: Remove.
+
+ * dirmngr/server.c (data_line_cookie_write): Factor code out to
+ data_line_write and make it a wrapper for that.
+ (data_line_write): New.
+ (cmd_dns_cert): New.
+ (register_commands): Register new command.
+
+ * g10/Makefile.am (LDADD): Remove DNSLIBS.
+ * g10/call-dirmngr.c (dns_cert_parm_s): New.
+ (dns_cert_data_cb, dns_cert_status_cb): New.
+ (gpg_dirmngr_dns_cert): New.
+ (gpg_dirmngr_get_pka): New.
+ * g10/gpgv.c (gpg_dirmngr_get_pka): New dummy function.
+ * g10/keyserver.c (keyserver_import_cert): Replace get_dns_cert by
+ gpg_dirmngr_dns_cert.
+ (keyserver_import_pka): Replace get_pka_info by gpg_dirmngr_get_pka.
+ * g10/mainproc.c: Include call-dirmngr.h.
+ (pka_uri_from_sig): Add CTX arg. Replace get_pka_info by
+ gpg_dirmngr_get_pka.
+
+ common: Minor change of hex2str to allow for embedded nul.
+ * common/convert.c (hex2str): Set ERRNO. Return adjusted COUNT.
+
+2015-04-23 NIIBE Yutaka <gniibe at fsij.org>
+
+ common: removal of t-support.c from t_jnlib_src.
+ * common/Makefile.am (t_jnlib_src): Remove t-support.c.
+
+2015-04-21 Werner Koch <wk at gnupg.org>
+
+ gpg: Make keyserver-option http_proxy work.
+ * g10/options.h (opt): Add field keyserver_options.http_proxy.
+ * g10/keyserver.c (warn_kshelper_option): Add arg noisy.
+ (parse_keyserver_options): Parse into new http_proxy field.
+ * g10/call-dirmngr.c (create_context): Send the http-proxy option.
+
+ common: Make proper use of http proxy parameter.
+ * common/http.c (is_hostname_port): New.
+ (send_request): Fix proxy name parsing.
+
+ dirmngr: Add http proxy support for keyservers.
+ * dirmngr/dirmngr.h (server_control_s): Add field http_proxy.
+ * dirmngr/dirmngr.c (dirmngr_init_default_ctrl): Copy http_proxy value
+ from OPT.
+ (dirmngr_deinit_default_ctrl): New.
+ (main): Call dirmngr_deinit_default_ctrl.
+ * dirmngr/server.c (start_command_handler): Ditto.
+ (option_handler): Add option "http-proxy".
+ * dirmngr/crlfetch.c (crl_fetch): Take http_proxy from CTRL.
+ * dirmngr/ocsp.c (do_ocsp_request): Ditto.
+ * dirmngr/ks-engine-hkp.c (send_request): Add proxy support.
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
+
+ gpg: Do not use honor-keyserver-url sub-option by default.
+
+ gpg: Make preferred keyservers work.
+ * g10/call-dirmngr.c (dirmngr_local_s): Add field set_keyservers_done.
+ (create_context): Move keyserver setting to ...
+ (open_context): here.
+ (clear_context_flags): New.
+ (gpg_dirmngr_ks_get): Add arg override_keyserver.
+ * g10/keyserver.c (keyserver_refresh): Improve diagnostics.
+ (keyserver_get_chunk): Ditto. Pass OVERRIDE_KEYSERVER to ks_get.
+
+ gpg: Update sub-options of --keyserver-options.
+ * g10/options.h (KEYSERVER_HTTP_PROXY): New.
+ (KEYSERVER_USE_TEMP_FILES, KEYSERVER_KEEP_TEMP_FILES): Remove.
+ (KEYSERVER_TIMEOUT): New.
+ * common/keyserver.h (KEYSERVER_TIMEOUT): Remove.
+ * g10/keyserver.c (keyserver_opts): Remove obsolete "use-temp-files"
+ and "keep-temp-files". Add "http-proxy" and "timeout".
+ (parse_keyserver_options): Remove 1.2 compatibility option
+ "honor-http_proxy". Remove "use-temp-files" and "keep-temp-files"
+ code.
+
+2015-04-14 Werner Koch <wk at gnupg.org>
+
+ agent: Send the new SETKEYINFO command to the Pinentry.
+ * agent/call-pinentry.c (agent_askpin): Add args keyinfo and
+ cache_mode. Change all callers to pass (NULL,0) for them. Send
+ SETKEYINFO command.
+ * agent/findkey.c (unprotect): Pass the keygrip and the cache_mode for
+ the new args.
+
+2015-04-14 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: better handling of extended APDU.
+ * scd/apdu.c (send_le): Bug fix for not append Z when lc<0&&le<0.
+ * scd/app-common.h (struct app_ctx_s): Use bit fields for flags.
+ * scd/ccid-driver.c (CCID_MAX_BUF): New. Only for OpenPGPcard.
+ (struct ccid_driver_s): New field of max_ccid_msglen.
+ Remove ifsd field.
+ (parse_ccid_descriptor): Initialize max_ccid_msglen.
+ (ccid_transceive_apdu_level): Implement sending extended APDU in
+ chain of CCID message.
+
+2015-04-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix NULL-segv due to invalid imported data.
+ * g10/free-packet.c (my_mpi_copy): New.
+ (copy_public_key, copy_signature): Use instead of mpi_copy.
+
+2015-04-13 Neal H. Walfield <neal at g10code.com>
+
+ dirmngr: If LDAP is not enable, don't build the LDAP bits.
+ * dirmngr/Makefile.am (dirmngr_SOURCES): Only include
+ ks-engine-ldap.c, ldap-parse-uri.c and ldap-parse-uri.h if USE_LDAP
+ is TRUE.
+ (module_tests): Only add t-ldap-parse-uri if USE_LDAP is TRUE.
+ * dirmngr/ks-action.c: Only include "ldap-parse-uri.h" if USE_LDAP is
+ TRUE.
+ (ks_action_help): Don't invoke LDAP functionality if USE_LDAP is not
+ TRUE.
+ (ks_action_search): Likewise.
+ (ks_action_get): Likewise.
+ (ks_action_put): Likewise.
+ * dirmngr/server.c: Only include "ldap-parse-uri.h" if USE_LDAP is
+ TRUE.
+ (cmd_keyserver): Don't invoke LDAP functionality if USE_LDAP is not
+ TRUE.
+
+2015-04-13 Werner Koch <wk at gnupg.org>
+
+ common: Do without nested fucntions to support non-gcc.
+ * common/t-stringhelp.c (test_strsplit): Remove nested function.
+
+2015-04-11 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.3.
+
+2015-04-11 Yuri Chornoivan <yurchor at ukr.net>
+
+ po: Update Ukrainian translation.
+
+2015-04-11 Ineiev <ineiev at gnu.org>
+
+ po: Update and review Russian translation.
+
+2015-04-10 Werner Koch <wk at gnupg.org>
+
+ dirmngr,w32: Make it build for Windows.
+ * dirmngr/Makefile.am (t_common_ldadd): Add missing libs.
+
+ Remove obsolete directories from AM_CPPFLAGS.
+
+ dirmngr,w32: Replace functions not available under Windows.
+ * dirmngr/ks-engine-ldap.c (extract_attributes): Replace isoptime and
+ gmtime_r.
+
+ common: Add new function gnupg_gmtime.
+ * common/gettime.c (gnupg_gmtime): New.
+ (gnupg_get_isotime): Use it. Also take care of an gmtime_t returning
+ an error.
+
+ common: Add new function isodate_human_to_tm.
+ * common/gettime.c (isotime_human_p): Add arg date_only.
+ (isodate_human_to_tm): New.
+ * common/t-gettime.c (test_isodate_human_to_tm): New.
+ (main): Call new test.
+
+ dirmngr,w32: Avoid name clash with existing function.
+ * dirmngr/ks-engine-ldap.c (ldap_connect): Rename to my_ldap_connect.
+
+ gpgparsemail: Fix last commit (3f2bdac)
+ * tools/rfc822parse.c (parse_field): Replace break by goto.
+
+2015-04-09 Werner Koch <wk at gnupg.org>
+
+ gpgparsemail: Fix case of zero length continuation lines.
+ * tools/rfc822parse.c (parse_field): Loop after continuation line.
+
+2015-04-08 Werner Koch <wk at gnupg.org>
+
+ sm: Fix certificate lookup in dirmngr cache.
+ * sm/call-dirmngr.c (get_cached_cert): Fix typo in LOOKUP command.
+
+2015-04-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Print the user id in --fast-list-mode.
+ * g10/keylist.c (list_keyblock_print, list_keyblock_colon): Change.
+
+ gpg: Prepare to pass additional context to the list functions.
+ * g10/keylist.c (struct sig_stats): Rename to keylist_context and add
+ field check_sigs.
+ (keylist_context_release): New.
+ (list_all): Set listctx.check_sigs and call release func.
+ (list_one): Ditto.
+ (locate_one): Ditto.
+ (list_keyblock_print): Use .check_sigs field. Repalce arg opaque by
+ listctx.
+ (list_keyblock): Ditto. Make static.
+ (list_keyblock_direct): New.
+ * g10/keygen.c (do_generate_keypair): Replace list_keyblock by
+ list_keyblock_direct.
+
+ gpg: Merge duplicated code for get_user_id et al.
+ * g10/getkey.c (get_user_id_string): Add args mode and r_LEN.
+ (get_user_id_string_native): Add new args.
+ (get_long_user_id_string, get_user_id): Rewrite using
+ get_user_id_string.
+
+ gpg: Add new option --debug-iolbf.
+ * g10/gpg.c (oDebugIOLBF): new.
+ (opts): Add --debug-iolbf.
+ (main): Set option.
+
+ Rename DBG_ASSUAN to DBG_IPC and add separate DBG_EXTPROG.
+ * g10/options.h (DBG_EXTPROG_VALUE): Separate from DBG_IPC_VALUE.
+
+ Fix use of DBG_CACHE and DBG_LOOKUP.
+ * dirmngr/dirmngr.h (DBG_LOOKUP_VALUE): Change to 8192.
+ * g10/options.h (DBG_LOOKUP_VALUE, DBG_LOOKUP): New.
+ * g10/getkey.c: Use DBG_LOOKUP instead of DBG_CACHE at most places.
+
+ gpg: Rename a debug macro.
+ * g10/options.h (DBG_CIPHER_VALUE): Rename to DBG_CRYPTO_VALUE.
+ (DBG_CIPHER): Rename to DBG_CRYPTO.
+
+2015-04-05 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix DoS while parsing mangled secret key packets.
+ * g10/parse-packet.c (parse_key): Check PKTLEN before calling mpi_read
+ et al.
+
+2015-04-03 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Fix keytocard.
+ g10/call-agent.h (agent_scd_learn): Add FORCE option.
+ g10/call-agent.c (agent_scd_learn): Implement FORCE option.
+ g10/keygen.c (gen_card_key): Follow the change of option.
+ g10/card-util.c (change_pin, card_status, factory_reset): Likewise.
+ g10/keyedit.c (keyedit_menu): Update private key storage by
+ agent_scd_learn.
+
+ agent: Add --force option for LEARN.
+ * agent/command.c (cmd_learn): Handle --force option.
+ (cmd_keytocard): Don't update key storage file.
+ * agent/agent.h (agent_handle_learn): Add FORCE.
+ * agent/learncard.c (agent_handle_learn): Implement FORCE to update
+ key stroage file.
+
+2015-03-31 Neal H. Walfield <neal at g10code.com>
+
+ dirmngr: Don't use alloca.
+ * dirmngr/ks-engine-ldap.c (ks_ldap_put): Replace use of alloca with
+ xmalloc and xfree.
+
+ dirmngr: Simplify truncation of long strings in debug code.
+ * dirmngr/ks-engine-ldap.c (modlist_dump): Simplify truncation of long
+ strings.
+
+ dirmngr: Use a better error code.
+ * dirmngr/ldap-parse-uri.c (ldap_parse_uri): On error, return
+ GPG_ERR_GENERAL, not GPG_ERR_ASS_GENERAL.
+
+ dirmngr: Better encapsulate the keyservers variable.
+ * dirmngr/dirmngr.h (struct server_control_s): Move field keyservers
+ from here...
+ * dirmngr/server.c (struct server_local_s): ... to here. Update
+ users.
+ * dirmngr/ks-action.h (ks_action_resolve): Add argument keyservers.
+ (ks_action_search): Likewise.
+ (ks_action_get): Likewise.
+ (ks_action_put): Likewise.
+ * dirmngr/ks-action.c (ks_action_resolve): Add argument keyservers.
+ Use it instead of ctrl->keyservers.
+ (ks_action_search): Likewise.
+ (ks_action_get): Likewise.
+ (ks_action_put): Likewise.
+
+2015-03-28 Neal H. Walfield <neal at g10code.de>
+
+ gpg: Only use the last specified keyserver.
+ * g10/gpg.c (main): Only use the last specified keyserver.
+
+2015-03-25 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix resource leaks and check rare errors.
+ * dirmngr/ks-engine-ldap.c (keyspec_to_ldap_filter): Fix resource
+ leak.
+ (ks_ldap_search): Check error from es_fopenmem. Use LDAP_ERR where
+ required.
+ (modlist_dump): Check error from es_fopenmem.
+ (uncescape): s/int/size_t/. Use existing macros.
+ (extract_attributes): Use existing trim function.
+ (ks_ldap_put): Do not segv on error from modlist_dump.
+
+ dirmngr: Minor cleanups.
+ * dirmngr/ks-engine-ldap.c [__riscos__]: Remove doubled util.h.
+ (ldap_to_gpg_err): s/GPG_ERR_GENERAL/GPG_ERR_INTERNAL/.
+ (tm2ldaptime): Use snprintf.
+ (ldap_connect): Get error code prior to log_error and and use modern
+ function. Use xfree, xtrustrdup etc.
+ (modlist_lookup): Use GNUPG_GCC_A_USED.
+ (modlist_free): Use xfree.
+
+ common: Add macro GNUPG_GCC_A_USED.
+ * common/util.h (GNUPG_GCC_A_USED): New.
+
+ sm: Change default algos to SHA256 (CSR) and AES128 (bulk encryption).
+ * sm/certreqgen.c (create_request): Change default hash algo.
+ * sm/gpgsm.c (DEFAULT_CIPHER_ALGO): Change default bulk cipher algo.
+
+2015-03-24 Werner Koch <wk at gnupg.org>
+
+ gpg,w32: Handle forward slash in --keyring option.
+ * g10/keydb.c (keydb_add_resource): Allow forward slash under Windows.
+
+2015-03-23 Neal H. Walfield <neal at g10code.de>
+
+ Improve documentation for ks_hkp_get.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_get): Improvement documentation.
+
+ Improve documenation of http_parse_uri.
+ * common/http.c (http_parse_uri): Improve documentation.
+
+ Add support to talking to LDAP key servers.
+ * g10/call-dirmngr.c (record_output): New function.
+ (ks_put_inq_cb): Use it here to generate a --with-colons like output
+ instead of a custom format.
+ * dirmngr/ks-action.c: Include "ldap-parse-uri.h".
+ (ks_action_help): If the provided URI is an LDAP URI, then use
+ ldap_parse_uri to parse. Call ks_ldap_help.
+ (ks_action_search): If passed an LDAP URI, then call ks_ldap_search.
+ (ks_action_get): Likewise.
+ (ks_action_put): Likewise. Also, change data from a 'const void *' to
+ a 'void *' and add info and infolen parameters. Add note that
+ function may modify DATA.
+ * dirmngr/ks-action.h (ks_action_put): Update declaration accordingly.
+ * dirmngr/server.c: Include "ldap-parse-uri.h".
+ (cmd_keyserver): If ITEM->URI is an LDAP URI, parse it using
+ ldap_parse_uri.
+ (hlp_ks_put): Improve documentation.
+ (cmd_ks_put): Also pass info and infolen to ks_action_put. Improve
+ documentation.
+ * dirmngr/ks-engine.h (ks_ldap_help): New declaration.
+ (ks_ldap_search): Likewise.
+ (ks_ldap_get): Likewise.
+ (ks_ldap_put): Likewise.
+ * dirmngr/ks-engine-ldap.c: New file.
+ * dirmngr/Makefile.am (dirmngr_SOURCES): Add ks-engine-ldap.c,
+ ldap-parse-uri.c and ldap-parse-uri.h.
+ (dirmngr_LDADD) [USE_LDAP]: Add $(ldaplibs).
+
+ Import _gpgme_parse_timestamp from gpgme as parse_timestamp.
+ * common/gettime.h (parse_timestamp): New declaration.
+ * common/gettime.c (_win32_timegm): New function imported from
+ gpgme/src/conversion.c:_gpgme_timegm.
+ (parse_timestamp): New function imported from
+ gpgme/src/conversion.c:_gpgme_parse_timestamp.
+
+ Move copy_stream function to misc.c.
+ * dirmngr/ks-action.c (copy_stream): Move function from here...
+ * dirmngr/misc.c (copy_stream): ... to here and drop the static
+ qualifier.
+ * dirmngr/misc.h (copy_stream): Add declaration.
+
+ Move armor_data to misc.c.
+ * dirmngr/ks-engine-hkp.c (armor_data): Move function from here...
+ * dirmngr/misc.c (armor_data): ... to here and drop static qualifier.
+ * dirmngr/misc.h: New declaration.
+
+ Add new LDAP utility functions.
+ * dirmngr/Makefile.am (module_tests): New variable.
+ (noinst_PROGRAMS): New primary. Set it to $(module_tests).
+ (TESTS): New variable. Set it to $(module_tests).
+ (t_common_src): New variable.
+ (t_common_ldadd): Likewise.
+ (t_ldap_parse_uri_SOURCES): New primary.
+ (t_ldap_parse_uri_LDADD): Likewise.
+ * dirmngr/ldap-parse-uri.c: New file.
+ * dirmngr/ldap-parse-uri.h: Likewise.
+ * dirmngr/t-ldap-parse-uri.c: Likewise.
+ * dirmngr/t-support.h: Likewise.
+
+ Add new function uri_query_lookup.
+ * common/http.h (uri_query_lookup): New declaration.
+ * common/http.c (uri_query_lookup): The corresponding implementation.
+
+ Add new function strlist_find.
+ * common/strlist.h (strlist_find): New declaration.
+ * common/strlist.c (strlist_find): New function.
+
+ common: Add new helper function, strsplit.
+ * common/stringhelp.h (strsplit): New declaration.
+ * common/stringhelp.c (strsplit): New function.
+ * common/t-stringhelp.c (test_strsplit): New function.
+ (main): Call it here.
+
+2015-03-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Consider a mailbox only userid in mail search mode.
+ * kbx/keybox-search.c: Include mbox-util.h.
+ (blob_cmp_mail): Improve OpenPGP uid parsing.
+
+ common: Add function is_valid_mailbox_mem.
+ * common/mbox-util.c (mem_count_chr): New.
+ (my_memstr): New.
+ (has_invalid_email_chars): Change args to work on a buffer.
+ (is_valid_mailbox_mem): New.
+ (is_valid_mailbox): Rewrite to use is_valid_mailbox_mem.
+
+ gpg: Find keys using mail addresses with garbage after the '>'
+ * kbx/keybox-search.c (blob_cmp_mail): Stop comparing at the '>'.
+
+ common: Fix syntax error when building with gnutls.
+ * common/http.c (send_request): Add missing comma.
+
+2015-03-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Emit status line NEWSIG before signature verification starts.
+ * g10/mainproc.c (check_sig_and_print): Emit STATUS_NEWSIG.
+
+ agent: Compute correct MPI length header for protected ECC keys.
+ * agent/cvt-openpgp.c (apply_protection): Strip leading zeroes from
+ opaque MPIs to comply with the OpenPGP spec.
+
+ hkps: Fix host name verification when using pools.
+ * common/http.c (send_request): Set the requested for SNI.
+ * dirmngr/ks-engine-hkp.c (map_host): Return the poolname and not
+ the selecting a host.
+
+ Define replacement error codes from libgpg-error 1.19.
+ * common/util.h: Add GPG_ERR_LDAP codes for libgpg-error < 1.19.
+
+2015-03-17 Andre Heinecke <aheinecke at intevation.de>
+
+ gpgtar: Fix extracting files with !(size % 512)
+ * tools/gpgtar-extract.c (extract_regular): Handle size multiples
+ of RECORDSIZE.
+
+2015-03-17 Werner Koch <wk at gnupg.org>
+
+ common: Add feature to ease using argparse's usage().
+ * common/argparse.c (show_help): Take care of flag value
+ (usage): Ditto.
+
+ common: Allow standalone build of argparse.c.
+ * common/argparse.h: Remove types.h - not required.
+ * common/argparse.c: Change to allow standalone use.
+
+2015-03-16 Werner Koch <wk at gnupg.org>
+
+ gpg: Create all MPIs with RFC-4880 correct length headers.
+ * g10/build-packet.c (gpg_mpi_write): Strip leading zeroes.
+
+ gpg: Allow printing of MPI values in --list-mode.
+ * g10/parse-packet.c (set_packet_list_mode): Set mpi_print_mode.
+ * g10/misc.c (mpi_print): Do not print an extra leading zero.
+
+ gpg: Fix broken write of opaque MPI length header.
+ * g10/build-packet.c (gpg_mpi_write): Use a char array for the length.
+
+2015-03-15 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix possible dead code elimination.
+ * g10/encrypt.c: Change condition for detecting a real file.
+
+ g13: Fix pointer wrap check.
+ * g13/utils.c (find_tuple, next_tuple): Cast pointer to size_t before
+ doing an overflow check.
+
+ agent: Remove useless conditions in command.c.
+ * agent/command.c (cmd_setkeydesc): Remove NULL check.
+ (cmd_get_passphrase): Ditto.
+ (cmd_clear_passphrase): Ditto.
+ (cmd_get_confirmation): Ditto.
+ (cmd_getval): Ditto.
+ (cmd_putval): Ditto.
+
+ agent: Fix length test in sshcontrol parser.
+ * agent/command-ssh.c (ssh_search_control_file): Check S before
+ upcasing it.
+
+ agent: Remove useless conditions.
+ * agent/genkey.c (agent_ask_new_passphrase): Remove useless condition.
+ * agent/command-ssh.c (ssh_identity_register): Ditto.
+
+ gpg: Remove useless condition.
+ * g10/keylist.c (list_keyblock_colon): Remove useless condition (PK).
+ (list_keyblock_print): Likewise.
+
+ scd: Fix possible NULL deref in apdu.c.
+ * scd/apdu.c (control_pcsc_direct): Take care of BUFLEN being NULL.
+ (control_pcsc_wrapped): Ditto.
+
+ common: Make openpgp_oid_to_str more robust.
+ * common/openpgp-oid.c (openpgp_oid_to_str): Take care of
+ gcry_mpi_get_opaque returning NULL. Remove useless condition !BUF.
+
+2015-03-11 Werner Koch <wk at gnupg.org>
+
+ agent: Improve error reporting from Pinentry.
+ * agent/call-pinentry.c (unlock_pinentry): Add error logging. Map
+ error source of uncommon errors to Pinentry.
+
+2015-03-10 Werner Koch <wk at gnupg.org>
+
+ gpg: Change --print-pka-records into an option.
+ * g10/gpg.c (aPrintPKARecords): Rename to oPrintPKARecords and do not
+ use it as a command.
+ * g10/keylist.c (list_keyblock): List PKA rceords also for secret
+ keys.
+
+ gpg: Add --list-gcrypt-config and "curve" item for --list-config.
+ * common/openpgp-oid.c (curve_supported_p): New.
+ (openpgp_enum_curves): New.
+ * common/t-openpgp-oid.c (test_openpgp_enum_curves): New.
+ (main): Add option --verbose.
+ * g10/gpg.c (opts): Add --list-gcrypt-config.
+ (list_config): Add items "curve" and "curveoid". Remove unused code.
+
+2015-03-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: fix for 64-bit arch.
+ * agent/pksign.c (agent_pksign_do): Use int.
+ * scd/app-openpgp.c (get_public_key): Likewise.
+
+2015-03-04 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: avoid chatter about trustdb when --quiet.
+ * g10/trustdb.c (tdb_check_trustdb_stale): avoid log_info() when
+ opt.quiet
+
+2015-02-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Lowercase mailbox for PKA lookups.
+ * common/stringhelp.c (ascii_strlwr): New.
+ * common/mbox-util.c (mailbox_from_userid): Downcase result.
+
+ gpg: Fix memory leak due to PKA lookup.
+ * g10/keyserver.c (keyserver_import_pka): Move the xfree.
+
+2015-02-25 Werner Koch <wk at gnupg.org>
+
+ gpg: Switch to a hash and CERT record based PKA system.
+ * common/dns-cert.c (get_dns_cert): Make r_key optional.
+ * common/pka.c: Rewrite for the new hash based lookup.
+ * common/t-pka.c: New.
+ * configure.ac: Remove option --disable-dns-pka.
+ (USE_DNS_PKA): Remove ac_define.
+ * g10/getkey.c (parse_auto_key_locate): Always include PKA.
+
+ common: Allow requesting a specific certtype with get_dns_cert()
+ * common/dns-cert.c (get_dns_cert): Add arg want_certtype. Change all
+ callers.
+ (CERTTYPE_): Move constants to ...
+ * common/dns-cert.h: here as DNS_CERTTYPE_.
+
+ Move new mailbox.c source file to common/.
+ * g10/mailbox.c: Move to ...
+ * common/mbox-util.c: new file.
+ * common/mbox-util.h: New. Include where needed.
+ * g10/t-mailbox.c: Move to ...
+ * common/t-mbox-util.c: new file.
+
+2015-02-24 Werner Koch <wk at gnupg.org>
+
+ gpg: Add command --print-pka-records.
+ * g10/gpg.c (main): Add command --print-pka-records.
+ * g10/options.h (struct opt): Add field "print_pka_records".
+ * g10/keylist.c (list_keyblock_pka): New.
+ (list_keyblock): Call it if new option is set.
+ (print_fingerprint): Add mode 10.
+
+ gpg: Add function to extract the mailbox.
+ * g10/misc.c (has_invalid_email_chars, is_valid_mailbox)
+ (is_valid_user_id): Move to ...
+ * g10/mailbox.c: new file.
+ (string_has_ctrl_or_space, has_dotdot_after_at): New.
+ (has_invalid_email_chars): New.
+
+ * g10/t-mailbox.c: New.
+ * g10/Makefile.am (module_tests): Add t-mailbox.
+ (t_mailbox_SOURCES, t_mailbox_LDADD): New.
+
+2015-02-23 Werner Koch <wk at gnupg.org>
+
+ gpg: Add option to print fingerprints in ICAO spelling.
+ * g10/gpg.c: Add option --with-icao-spelling.
+ * g10/options.h (struct opt): Add with_icao_spelling.
+ * g10/keylist.c (print_icao_hexdigit): New.
+ (print_fingerprint): Print ICAO spelling.
+
+ gpg: Skip legacy keys while searching keyrings.
+ * g10/getkey.c (search_modes_are_fingerprint): New.
+ (lookup): Skip over legacy keys.
+
+ common: Fix regression due to commit 2183683b.
+ * common/dns-cert.c (get_dns_cert): Remove cruft.
+
+2015-02-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Replace remaining uses of stdio by estream.
+ * g10/sign.c (sign_file): Use log_printf instead of stderr.
+ * g10/tdbdump.c (export_ownertrust): Use estream fucntions.
+ (import_ownertrust): Ditto.
+ * g10/tdbio.c (tdbio_dump_record): Ditto. Change arg to estream_t.
+
+ gpg: Fix segv due to NULL value stored as opaque MPI.
+ * g10/build-packet.c (gpg_mpi_write): Check for NULL return from
+ gcry_mpi_get_opaque.
+ (gpg_mpi_write_nohdr, do_key): Ditto.
+ * g10/keyid.c (hash_public_key): Ditto.
+
+2015-02-12 Werner Koch <wk at gnupg.org>
+
+ scd: Fix regression in 2.1.2 (due to commit 2183683)
+ * scd/apdu.c (pcsc_vendor_specific_init): Replace use of
+ bufNN_to_uint by direct code.
+
+2015-02-12 Andre Heinecke <aheinecke at intevation.de>
+
+ dirmngr: Initialize cache from sysconfig dir.
+ * dirmngr/certcache.c (cert_cache_init): Load certificates
+ from sysconfig dir instead of the homeidr.
+ * dirmngr/dirmngr.c (main): Removed parsing of obsolete
+ homedir_data option.
+ * dirmngr/dirmngr.h (opt): Removed homedir_data.
+ * doc/dirmngr.texi: Update and clarify certs directory doc.
+
+2015-02-11 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.2.
+
+ dirmngr: Avoid warning about unused function.
+ * dirmngr/dirmngr.c (my_gnutls_log): Build only if gnutls is used.
+
+ build: Update standard build-aux files.
+
+ Use inline functions to convert buffer data to scalars.
+ * common/host2net.h (buf16_to_ulong, buf16_to_uint): New.
+ (buf16_to_ushort, buf16_to_u16): New.
+ (buf32_to_size_t, buf32_to_ulong, buf32_to_uint, buf32_to_u32): New.
+
+2015-02-09 Werner Koch <wk at gnupg.org>
+
+ gpg: Prevent an invalid memory read using a garbled keyring.
+ * g10/keyring.c (keyring_get_keyblock): Whitelist allowed packet
+ types.
+ * g10/keydb.c (parse_keyblock_image): Ditto.
+
+ gpg: Fix a NULL-deref in export due to invalid packet lengths.
+ * g10/build-packet.c (write_fake_data): Take care of a NULL stored as
+ opaque MPI.
+
+ gpg: Fix a NULL-deref due to empty ring trust packets.
+ * g10/parse-packet.c (parse_trust): Always allocate a packet.
+
+2015-02-04 Werner Koch <wk at gnupg.org>
+
+ gpg-agent: Use "pinentry-basic" as fallback.
+ * common/homedir.c (get_default_pinentry_name): New.
+ (gnupg_module_name): Use that for the default pinentry.
+ (gnupg_module_name_flush_some): New.
+ * agent/gpg-agent.c (agent_sighup_action): Flush some module names.
+ * agent/call-pinentry.c (start_pinentry): Do not modify
+ opt.pinentry_program.
+
+ w32: Add manifest to gpg.
+ * g10/gpg.w32-manifest.in: New.
+ * g10/gpg-w32info.rc: Add manifest.
+ * g10/Makefile.am (EXTRA_DIST): Add manifest.
+ (gpg-w32info.o): Depend on manifest.
+ * configure.ac (BUILD_VERSION): New.
+ (AC_CONFIG_FILES): Add manifest.
+
+2015-02-03 Werner Koch <wk at gnupg.org>
+
+ Update copyright years.
+ * common/w32info-rc.h.in (W32INFO_COMPANYNAME): Change to "The GnuPG
+ Project".
+
+2015-02-02 Werner Koch <wk at gnupg.org>
+
+ w32: Change default Windows install dir and add bin to PATH.
+ * build-aux/speedo.mk (WITH_GUI): New macro. The Windows installer is
+ now build by default without any GUI stuff.
+ * build-aux/speedo/w32/inst.nsi: Change standard installation
+ directory.
+ (AddToPath, un.RemoveFromPath): New.
+ (gnupginst): Add bin directory to the PATH.
+
+2015-02-01 Werner Koch <wk at gnupg.org>
+
+ w32: Allow for Unicocde installation directory.
+ * common/homedir.c (w32_rootdir): Use Unicode fucntion not only for
+ WinCE.
+
+2015-01-30 Joshua Rogers <git at internot.info>
+
+ kbx: Fix resource leak.
+ * kbx/keybox-update.c (blob_filecopy): Fix resource leak. On error
+ return, 'fp' and 'newfp' was never closed.
+
+2015-01-29 Werner Koch <wk at gnupg.org>
+
+ agent: Fix use of imported but unprotected openpgp keys.
+ * agent/agent.h (PRIVATE_KEY_OPENPGP_NONE): New.
+ * agent/command.c (do_one_keyinfo): Implement it.
+ * agent/findkey.c (agent_key_from_file): Ditto.
+ (agent_key_info_from_file): Ditto.
+ (agent_delete_key): Ditto.
+ * agent/protect.c (agent_private_key_type): Add detection for openpgp
+ "none" method.
+
+2015-01-29 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese Translation.
+
+2015-01-28 Werner Koch <wk at gnupg.org>
+
+ gpg: Limit the size of key packets to a sensible value.
+ * g10/parse-packet.c (MAX_KEY_PACKET_LENGTH): New.
+ (MAX_UID_PACKET_LENGTH): New.
+ (MAX_COMMENT_PACKET_LENGTH): New.
+ (MAX_ATTR_PACKET_LENGTH): New.
+ (parse_key): Limit the size of a key packet to 256k.
+ (parse_user_id): Use macro for the packet size limit.
+ (parse_attribute): Ditto.
+ (parse_comment): Ditto.
+
+ gpg: Fix buffering problem in --list-config.
+ * g10/gpg.c (list_config): Replace print_sanitized_string2 by
+ es_write_sanitized.
+
+ * common/stringhelp.c (print_sanitized_buffer2): Remove.
+ (print_sanitized_buffer, print_sanitized_utf8_buffer): Remove.
+ (print_sanitized_utf8_buffer, print_sanitized_utf8_string): Remove.
+ (print_sanitized_string): Remove.
+
+ * sm/certdump.c (print_dn_part, print_dn_parts): Remove arg FP.
+ (pretty_print_sexp, gpgsm_print_name2, gpgsm_print_name): Remove.
+
+ Add a hook to be called right after main.
+ * common/init.c (early_system_init): New stub function.
+
+ gpg: Allow predefined names as answer to the keygen.algo prompt.
+ * g10/keygen.c (ask_algo): Add list of strings.
+
+ agent: Add some extra robustness to extract_private_key.
+ * agent/cvt-openpgp.c (extract_private_key): Add arg "arraysize".
+ Make sure that R_FLAGS and R_CURVE are set to NULL.
+
+2015-01-28 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix varargs call for 64-bit arch on ECC keys.
+ * scd/app-openpgp.c (store_fpr): Remove CARD_VERSION from the
+ arguments.
+ (rsa_writekey): Follow the change.
+ (do_genkey): Likewise.
+ (ecc_writekey): Likewise. Cast to size_t.
+
+2015-01-27 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix segv introduced to commit 4d7c9b0.
+ * g10/keygen.c (get_parameter_passphrase): Take care of R == NULL.
+
+2015-01-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix agent_public_key_from_file for ECC.
+ * agent/cvt-openpgp.c (extract_private_key): New.
+ (convert_to_openpgp): Use extract_private_key.
+ * agent/findkey.c (agent_public_key_from_file): Use
+ extract_private_key.
+
+2015-01-26 Werner Koch <wk at gnupg.org>
+
+ sm: Simplify fix ed8383c6.
+ * sm/minip12.c (p12_build): Release PWBUF only at the end.
+
+2015-01-25 Joshua Rogers <git at internot.info>
+
+ ccid: Remove incorrect expression leading to errors.
+ * scd/ccid-driver.c (send_escape_cmd): Fix setting of 'rc'.
+
+2015-01-23 Werner Koch <wk at gnupg.org>
+
+ gpgconf: Fix validity check for UINT32 values.
+ * tools/gpgconf-comp.c (option_check_validity): Enable check for
+ UINT32.
+
+2015-01-22 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve skipping of PGP-2 keys.
+ * g10/keydb.c (keydb_search_first, keydb_search_next): Skip legacy
+ keys.
+ * g10/keyring.c (keyring_get_keyblock): Handle GPG_ERR_LEGACY_KEY.
+ (prepare_search): Ditto.
+ (keyring_rebuild_cache): Skip legacy keys.
+ * g10/keyserver.c (keyidlist): Ditto.
+ * g10/trustdb.c (validate_key_list): Ditto.
+
+ gpg: Add dedicated error code for PGP-2 keys.
+ * g10/parse-packet.c (parse_key): Return GPG_ERR_LEGACY_KEY for PGP2
+ keys.
+ * g10/import.c (read_block): Simplify by checking GPG_ERR_LEGACY_KEY.
+ * g10/getkey.c (lookup): Silence error message for PGP-2 keys.
+
+ * common/util.h (GPG_ERR_LEGACY_KEY): Add replacement for older
+ libgpg-error.
+
+ gpg: Replace remaining old error code macros by GPG_ERR_.
+ * g10/gpg.h (g10_errstr): Remove macro and change all occurrences by
+ gpg_strerror.
+ (G10ERR_): Remove all macros and change all occurrences by their
+ GPG_ERR_ counterparts.
+
+ gpg: Remove an unused variable.
+ * g10/getkey.c (getkey_ctx_s): Remove last_rc.
+
+2015-01-21 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix TLS build problems.
+ * dirmngr/Makefile.am (AM_CFLAGS): Add flags for TLS libs.
+
+ gpg: Support --passphrase with --quick-gen-key.
+ * g10/keygen.c: Include shareddefs.h.
+ (quick_generate_keypair): Support static passphrase.
+ (get_parameter_passphrase): New.
+ (do_generate_keypair): Use it.
+
+ gpg: Re-enable the "Passphrase" parameter for batch key generation.
+ * agent/command.c (cmd_genkey): Add option --inq-passwd.
+ * agent/genkey.c (agent_genkey): Add new arg override_passphrase.
+ * g10/call-agent.c (inq_genkey_parms): Handle NEWPASSWD keyword.
+ (agent_genkey): Add arg optional arg "passphrase".
+ * g10/keygen.c (common_gen, gen_elg, gen_dsa, gen_ecc)
+ (gen_rsa, do_create): Add arg "passphrase" and pass it through.
+ (do_generate_keypair): Make use of pPASSPHRASE.
+ (release_parameter_list): Wipe out a passphrase parameter.
+
+2015-01-19 Werner Koch <wk at gnupg.org>
+
+ kbx: Minor cleanup for the previous fix.
+ * kbx/keybox-search.c (blob_get_keyid): Rename to
+ blob_get_first_keyid. Check number of keys and remove blob type check.
+
+2015-01-19 Damien Goutte-Gattat <dgouttegattat at incenp.org>
+
+ kbx: Call skipfnc callback to filter out keys.
+ * kbx/keybox-search.c (blob_get_keyid): New.
+ (keybox-search): Call skipfnc callback function.
+
+2015-01-13 Andreas Schwier <andreas.schwier at cardcontact.de>
+
+ scd: Allow for certificates > 1024 with PC/SC.
+ * scd/pcsc-wrapper.c (handle_transmit): Enlarge buffer to 4096 too
+ allow for larger certificates.
+
+2015-01-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ dirmngr: Fix error code path of map_host.
+ * dirmngr/ks-engine-hkp.c (map_host): Fix error return.
+
+2015-01-08 Joshua Rogers <git at internot.info>
+
+ scd: fix get_public_key for OpenPGPcard v1.0.
+ * scd/app-openpgp.c (get_public_key): correctly close 'fp' upon use.
+
+2015-01-07 NIIBE Yutaka <gniibe at fsij.org>
+
+ dirmngr: fix LDAP query PATTERNS limit check.
+ * dirmngr/ldap.c (start_cert_fetch_ldap): fix ARGC limitation.
+
+ scd: fix merge failure.
+ * scd/apdu.c (pcsc_pinpad_verify): Remove wrong lines inserted by
+ merge.
+
+2015-01-05 Werner Koch <wk at gnupg.org>
+
+ sm,g13: Init local vars to avoid compiler warnings.
+ * sm/misc.c (transform_sigval): Init RSA_S_LEN.
+ * g13/mount.c (read_keyblob): Init HEADERLEN.
+
+ gpg: Remove unused args from a function.
+ * g10/keyserver.c (parse_keyserver_uri): Remove args configname and
+ configlineno. Change all callers.
+
+ gpg: Clear a possible rest of the KDF secret buffer.
+ * g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Fix order of args.
+
+ build: Require automake 1.14.
+ * configure.ac (AM_INIT_AUTOMAKE): Add serial-tests.
+
+2015-01-04 Werner Koch <wk at gnupg.org>
+
+ agent: Make --allow-loopback-pinentry gpgconf changeable.
+
+2014-12-22 Joshua Rogers <git at internot.info>
+
+ tools: Free variable before return.
+ * tools/gpgconf-comp.c: Free 'dest_filename' before it is returned
+ upon error.
+
+2014-12-22 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ sm: Avoid double-free on iconv failure.
+ * sm/minip12.c: (p12_build) if jnlib_iconv_open fails, avoid
+ double-free of pwbuf.
+
+ scd: Avoid double-free on error condition in scd.
+ * scd/command.c (cmd_readkey): avoid double-free of cert
+
+ avoid future chance of using uninitialized memory.
+ * common/iobuf.c: (iobuf_open): initialize len
+
+ avoid double-close in unusual dotlock situations.
+ * common/dotlock.c: (dotlock_create_unix) avoid double-close()
+ in unusual situations.
+
+ gpgkey2ssh: clean up varargs.
+ * tools/gpgkey2ssh.c (key_to_blob) : ensure that va_end is called.
+
+2014-12-22 Werner Koch <wk at gnupg.org>
+
+ doc: Fix memory leak in yat2m.
+ * doc/yat2m.c (write_th): Free NAME.
+
+ dirmngr: Fix memory leak.
+ * dirmngr/server.c (cmd_ks_search, cmd_ks_get): Fix memory leak.
+
+ * dirmngr/ks-engine-hkp.c (ks_hkp_mark_host): Remove double check.
+
+ dirmngr: Remove un-needed check.
+ * dirmngr/crlfetch.c (crl_fetch): Check that URL is not NULL.
+
+ dirmngr,gpgsm: Return NULL on fail.
+ * dirmngr/ldapserver.c (ldapserver_parse_one): Set SERVER to NULL.
+ * sm/gpgsm.c (parse_keyserver_line): Ditto.
+
+2014-12-22 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: ECDH Support.
+ * agent/divert-scd.c (divert_pkdecrypt): Support ECDH.
+ * scd/app-openpgp.c (get_algo_byte, store_fpr): Support ECDH.
+ (send_key_attr): Support ECDH. Fix EdDSA algorithm value.
+ (retrieve_key_material): Initialize fields.
+ (get_public_key, ecc_writekey, do_writekey): Support ECDH.
+ (ecdh_writekey): Remove.
+ (do_decipher): Support ECDH.
+ (parse_algorithm_attribute): Support ECDH. Fix EdDSA.
+
+2014-12-19 Werner Koch <wk at gnupg.org>
+
+ agent: Make sure --max-cache-ttl is >= --default-cache-ttl.
+ * agent/gpg-agent.c (finalize_rereadable_options): New.
+ (main, reread_configuration): Call it.
+
+ agent: Keep the session environment for restricted connections.
+ * agent/command-ssh.c (setup_ssh_env): Move code to ...
+ * agent/gpg-agent.c (agent_copy_startup_env): .. new function. Change
+ calllers.
+ * agent/command.c (start_command_handler): Call that fucntion for
+ restricted connections.
+
+ agent: Fix string prepended to remotely initiated prompts.
+ * agent/command.c (cmd_setkeydesc): Use %0A and not \n. Make
+ translatable.
+
+2014-12-18 Werner Koch <wk at gnupg.org>
+
+ build: Remove option to build without agent.
+ * configure.ac (build-agent): Set to yes.
+
+2014-12-17 Werner Koch <wk at gnupg.org>
+
+ gpgconf: Exit with failure if --launch fails.
+ * tools/gpgconf-comp.c (gc_component_launch): Return an error code.
+ * tools/gpgconf.c (main): Exit if launch failed.
+
+2014-12-16 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.1.
+
+ po: Update the German translation.
+
+2014-12-16 Petr Pisar <petr.pisar at atlas.cz>
+
+ po: Update Czech translation.
+
+2014-12-16 Werner Koch <wk at gnupg.org>
+
+ gpg: Show private DO information in the card status.
+ * g10/call-agent.c (agent_release_card_info): Free private_do.
+ (learn_status_cb): Parse PRIVATE-DO-n stati.
+
+2014-12-16 Ineiev <ineiev at gnu.org>
+
+ po: Update Russian translation.
+
+2014-12-16 Jedi <jedi at jedi.org>
+
+ po: Update zh_TW translation.
+
+2014-12-15 Werner Koch <wk at gnupg.org>
+
+ gpg: Add sub-command "factory-reset" to --card-edit.
+ * common/util.h (GPG_ERR_OBJ_TERM_STATE): New.
+ * scd/iso7816.c (map_sw): Add this error code.
+ * scd/app-openpgp.c (do_getattr): Return the life cycle indicator.
+ * scd/app.c (select_application): Allow a return value of
+ GPG_ERR_OBJ_TERM_STATE.
+ * scd/scdaemon.c (set_debug): Print the DBG_READER value.
+ * g10/call-agent.c (start_agent): Print a status line for the
+ termination state.
+ (agent_scd_learn): Make arg "info" optional.
+ (agent_scd_apdu): New.
+ * g10/card-util.c (send_apdu): New.
+ (factory_reset): New.
+ (card_edit): Add command factory-reset.
+
+ gpg: Fix regression in notation data regression.
+ * g10/misc.c (pct_expando): Reorder conditions for clarity.
+ * g10/sign.c (write_signature_packets): Fix notation data creation.
+
+ gpg: Avoid extra LF in notaion data listing.
+ * g10/keylist.c (show_notation): Use log_printf.
+
+2014-12-12 Werner Koch <wk at gnupg.org>
+
+ scd: Fix possibly inhibited checkpin of the admin pin.
+ * scd/app-openpgp.c (do_check_pin): Do not check a byte of a released
+ buffer.
+
+ gpg: Let --card--status create a shadow key (card key stub).
+ * agent/command.c (cmd_learn): Add option --sendinfo.
+ * agent/learncard.c (agent_handle_learn): Add arg "send" andsend
+ certifciate only if that is set.
+ * g10/call-agent.c (agent_scd_learn): Use --sendinfo. Make INFO
+ optional.
+ (agent_learn): Remove.
+ * g10/keygen.c (gen_card_key): Replace agent_learn by agent_scd_learn.
+
+ gpg: Fix possible read of unallocated memory.
+ * g10/parse-packet.c (can_handle_critical): Check content length
+ before calling can_handle_critical_notation.
+
+2014-12-11 Werner Koch <wk at gnupg.org>
+
+ build: Replace deprecated autconf macro.
+ * m4/intl.m4: s/AM_PROG_MKDIR_P/AC_PROG_MKDIR_P/
+ * m4/po.m4: Ditto.
+
+2014-12-08 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Improve dead host detection.
+ * dirmngr/ks-engine-hkp.c (handle_send_request_error): Mark host dead
+ also for 2 other error messages.
+
+ http: Improve diagnostic messages.
+ * common/http.c (send_request): Print TLS alert info
+ (connect_server): Detect bogus DNS entry.
+
+ gpg: Obsolete some keyserver helper options.
+ * g10/options.h (opt): Remove keyserver_options.other.
+ * g10/gpg.c (main): Obsolete option --honor-http-proxt.
+ * g10/keyserver.c (add_canonical_option): Replace by ...
+ (warn_kshelper_option): New.
+ (parse_keyserver_uri): Obsolete "x-broken-http".
+
+ dirmngr: Return a proper error for all dead hosts.
+ * dirmngr/ks-engine-hkp.c (map_host): Change to return an gpg_error_t.
+ Return an error code for all dead hosts.
+ (make_host_part): Change to return an gpg_error_t. Change all
+ callers.
+
+ gpg: Write a status line for a failed --send-keys.
+ * g10/keyserver.c (keyserver_put): Write an status error.
+
+2014-12-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix for EdDSA.
+ * scd/app-openpgp.c (get_algo_byte): It catches 22.
+ (store_fpr): It's MPI usually, but it's opaque bytes for EdDSA.
+
+2014-12-05 Andre Heinecke <aheinecke at intevation.de>
+
+ Document no-allow-mark-trusted option.
+ doc: Document no-allow-mark-trusted for gpg-agent
+
+ * doc/gpg-agent.texi: Change allow-mark-trusted doc to
+ no-allow-mark-trusted.
+
+ --
+ Since rev. 78a56b14 allow-mark-trusted is the default option
+ and was replaced by no-allow-mark-trusted to disable the
+ interactive prompt.
+
+2014-12-05 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix for NIST P-256.
+ * g10/card-util.c (card_store_subkey): Error check.
+ * scd/app-opengpg.c (ecc_writekey): Support NIST P-256.
+ (do_writekey): Error check.
+
+2014-12-04 Werner Koch <wk at gnupg.org>
+
+ gpg: Allow import of large keys.
+ * g10/import.c (import): Skip too large keys.
+ * kbx/keybox-file.c (IMAGELEN_LIMIT): Change limit from 2MB to 5MB.
+
+2014-12-03 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove option aliases --[no-]throw-keyid and --notation-data.
+ * g10/gpg.c (opts): Remove them.
+ * g10/options.h (opt): s/throw_keyid/throw_keyids/ and change users.
+
+2014-12-02 Werner Koch <wk at gnupg.org>
+
+ agent: Replace some sprintf.
+ * agent/call-scd.c (agent_card_pksign): Replace sprintf by bin2hex.
+ * agent/command-ssh.c (ssh_identity_register): Ditto.
+ * agent/pkdecrypt.c (agent_pkdecrypt): Replace sprintf by
+ put_membuf_printf.
+
+2014-12-01 Werner Koch <wk at gnupg.org>
+
+ tools: Improve watchgnupg portability.
+ * configure.ac (AC_CHECK_HEADERS): Check for sys.select.h
+ * tools/watchgnupg.c: Include it.
+
+ gpg: Fix export bug using exact search with only one key in the keybox.
+ * g10/export.c (do_export_stream): Disable caching.
+ * g10/keyserver.c (keyidlist): Ditto.
+
+ scd: Implement socket redirection.
+ * scd/scdaemon.c (ENAMETOOLONG): New.
+ (redir_socket_name): New.
+ (cleanup): Take care of a redirected socket.
+ (main): Pass redir_socket_name to create_server_socket.
+ (create_socket_name): Remove superfluous length check.
+ (create_server_socket): Add arg r_redir_name and implement
+ redirection. Replace assert for older Assuan by an error message.
+
+ dirmngr: Implement socket redirection.
+ * dirmngr/dirmngr.c (ENAMETOOLONG): new.
+ (redir_socket_name): New.
+ (main): Add Assuan socket redirection.
+ (cleanup): Adjust cleanup for redirection.
+
+2014-11-28 Werner Koch <wk at gnupg.org>
+
+ agent: Implement socket redirection.
+ * agent/gpg-agent.c (ENAMETOOLONG): New.
+ (redir_socket_name, redir_socket_name_extra)
+ (redir_socket_name_ssh): New.
+ (remove_socket): Take care of the redir names.
+ (main): Pass the redir names to create_server_socket.
+ (create_socket_name): Remove length check - that is anyway done later.
+ (create_server_socket): Add arg r_redir_name and implement redirection
+ if Libassuan is at least 2.14.
+
+ gpg: Change another BUG() call to a regular error message.
+ * g10/mainproc.c (proc_tree): Replace BUG by a proper error messages.
+
+ Add option --no-autostart.
+ * g10/gpg.c: Add option --no-autostart.
+ * sm/gpgsm.c: Ditto.
+ * g10/options.h (opt): Add field autostart.
+ * sm/gpgsm.h (opt): Ditto.
+ * g10/call-agent.c (start_agent): Print note if agent was not
+ autostarted.
+ * sm/call-agent.c (start_agent): Ditto.
+ * g10/call-dirmngr.c (create_context): Likewise.
+ * sm/call-dirmngr.c (start_dirmngr_ext): Ditto.
+
+2014-11-27 Мирослав Николић <wk at gnupg.org>
+
+ gpg-agent: Add restricted connection feature.
+ * agent/agent.h (opt): Add field extra_socket.
+ (server_control_s): Add field restricted.
+ * agent/command.c: Check restricted flag on many commands.
+ * agent/gpg-agent.c (oExtraSocket): New.
+ (opts): Add option --extra-socket.
+ (socket_name_extra): New.
+ (cleanup): Cleanup that socket name.
+ (main): Implement oExtraSocket.
+ (create_socket_name): Add arg homedir and change all callers.
+ (create_server_socket): Rename arg is_ssh to primary and change
+ callers.
+ (start_connection_thread): Take ctrl as arg.
+ (start_connection_thread_std): New.
+ (start_connection_thread_extra): New.
+ (handle_connections): Add arg listen_fd_extra and replace the
+ connection starting code by parameterized loop.
+ * common/asshelp.c (start_new_gpg_agent): Detect the use of the
+ restricted mode and don't fail on sending the pinentry environment.
+
+ * common/util.h (GPG_ERR_FORBIDDEN): New.
+
+ agent: Make auditing of the option list easier.
+ * agent/gpg-agent.c (opts): Use ARGPARSE_ macros.
+
+2014-11-26 Kristian Fiskerstrand <kf at sumptuouscapital.com>
+
+ dirmngr: Only report hkps scheme when available.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_help): Make use of TLS macros.
+
+2014-11-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Change a bug() call to a regular error message.
+ * g10/decrypt-data.c (decrypt_data): Return an error code instead of
+ calling BUG().
+
+2014-11-25 Werner Koch <wk at gnupg.org>
+
+ Fix buffer overflow in openpgp_oid_to_str.
+ * common/openpgp-oid.c (openpgp_oid_to_str): Fix unsigned underflow.
+
+ * common/t-openpgp-oid.c (BADOID): New.
+ (test_openpgp_oid_to_str): Add test cases.
+
+2014-11-24 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix use of uninit.value in listing sig subpkts.
+ * g10/parse-packet.c (dump_sig_subpkt): Print regex subpacket
+ sanitized.
+
+ gpg: Fix off-by-one read in the attribute subpacket parser.
+ * g10/parse-packet.c (parse_attribute_subpkts): Check that the
+ attribute packet is large enough for the subpacket type.
+
+ gpg: Fix batch generation of ECC keys.
+ * g10/keygen.c (get_parameter_algo): Map ECC algorithm strings
+ directly.
+
+2014-11-24 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ Distinguish between ARGPARSE_AMBIGUOUS_{OPTION,COMMAND}
+ * common/argparse.c (initialize): Use correct value.
+
+ gpg: Refer to --throw-keyids instead of --throw-keyid.
+ * g10/encrypt.c: adjust error message
+
+2014-11-21 Werner Koch <wk at gnupg.org>
+
+ gpg: Track number of skipped v3 keys on import.
+ * g10/import.c (stats_s): Add field v3keys.
+ (import): Update this field.
+ (import_print_stats): Print v3 key count.
+ (read_block): Skip v3 keys and return a count for them.
+
+ gpg: Fix regression in parse_key.
+ * g10/parse-packet.c (parse): Better return just the gpg_err_code.
+ (parse_key): Return the error code.
+
+ speedo: Add simple logos to the installer.
+ * build-aux/speedo/w32/README.txt: Include GnuPG Readme.
+ * build-aux/speedo/w32/gnupg-logo-150x57.bmp: New.
+ * build-aux/speedo/w32/gnupg-logo-164x314.bmp: New.
+ * build-aux/speedo/w32/inst.nsi: Add logos.
+ * build-aux/speedo.mk ($(bdir)/NEWS.tmp): Extract news items.
+
+2014-11-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix hash detection for ECDSA.
+ * g10/sign.c (sign_file): Use DSA or ECDSA and not DSA|EdDSA.
+
+ Fix linker problem on OS X.
+ * common/init.c (default_errsource): Move to the .data segmemt.
+
+2014-11-19 Werner Koch <wk at gnupg.org>
+
+ gpg-connect-agent: Add convenience option --uiserver.
+
+ Add "gpgconf --kill dirmngr" and avoid useless launch before a kill.
+ * common/asshelp.c (start_new_gpg_agent): Add arg autostart. Change
+ all callers to use 1 for it.
+ (start_new_dirmngr): Ditto.
+ * tools/gpg-connect-agent.c: Add option --no-autostart.
+ (main): Default autostart to 1.
+ (start_agent): Implement no-autostart.
+ * tools/gpgconf-comp.c (gpg_agent_runtime_change): Use --no-autostart.
+ (scdaemon_runtime_change): Ditto.
+ (dirmngr_runtime_change): New.
+
+ po: Copied missing translations from the 2.0 branch.
+ * po/LINGUAS: Add new translations.
+
+2014-11-17 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix a NULL-deref for invalid input data.
+ * g10/mainproc.c (proc_encrypted): Take care of canceled passpharse
+ entry.
+
+2014-11-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Make the use of "--verify FILE" for detached sigs harder.
+ * g10/openfile.c (open_sigfile): Factor some code out to ...
+ (get_matching_datafile): new function.
+ * g10/plaintext.c (hash_datafiles): Do not try to find matching file
+ in batch mode.
+ * g10/mainproc.c (check_sig_and_print): Print a warning if a possibly
+ matching data file is not used by a standard signatures.
+
+ gpg: Fix a missing LF in debug output.
+ * g10/kbnode.c (dump_kbnode): Print a LF.
+
+ gpg: Remove PGP-2 related cruft.
+ * g10/armor.c (parse_hash_header,carmor_filter): Ignore MD5 in hash
+ header.
+ (fake_packet): Remove pgp-2 workaround for white space stripping.
+ * g10/filter.h (armor_filter_context_t): Remove field pgp2mode.
+ * g10/options.h (opt): Remove field pgp2_workarounds.
+ * g10/gpg.c (main): Do not set this field.
+ * g10/gpgv.c (main): Ditto.
+ * g10/mainproc.c (proc_encrypted): Use SHA-1 as fallback s2k hash
+ algo. Using MD5 here is useless.
+ (proc_plaintext): Remove PGP-2 related woraround
+ (proc_tree): Remove another workaround but keep the one for PGP-5.
+
+2014-11-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve perceived speed of secret key listings.
+ * g10/keylist.c (list_keyblock): Flush stdout for secret keys.
+
+ gpg: Fix regression in --refresh-keys.
+ * g10/keyserver.c (keyserver_get): Factor all code out to ...
+ (keyserver_get_chunk): new. Extimate line length.
+ (keyserver_get): Split up requests into chunks.
+
+ gpg: Add import options "keep-ownertrust".
+ * g10/options.h (IMPORT_KEEP_OWNERTTRUST): New.
+ * g10/import.c (parse_import_options): Add "keep-ownertrust".
+ (import_one): Act upon new option.
+
+2014-11-11 Werner Koch <wk at gnupg.org>
+
+ Remove use of gnulib (part 2)
+ * configure.ac (strpbrk): Add to AC_CHECK_FUNCS.
+ (gl_EARLY): Remove.
+ * common/stringhelp.c (strpbrk) [!HAVE_STRPBRK]: New.
+ * common/sysutils.c (gnupg_mkdtemp): New. Based on code from
+ glibc-2.6.
+ (gnupg_setenv): Rewrite.
+ (gnupg_unsetenv): Rewrite.
+ * g10/exec.c: Include sysutils.h and replace mkdtemp by gnupg_mkdtemp.
+ * g13/be-encfs.c: Ditto.
+ * g13/mount.c: Ditto.
+ * tools/symcryptrun.c (confucius_mktmpdir): Ditto.
+
+ Remove use of gnulib (part 1)
+ * gl/: Remove entire tree.
+ * configure.ac: Remove gnulib tests and the gl/ Makefile.
+ (setenv): Add to AC_CHECK_FUNCS.
+ * autogen.rc (extra_aclocal_flags): Set to empty.
+ * Makefile.am (ACLOCAL_AMFLAGS): Remove -I gl/m4
+ (SUBDIRS): Remove gl/.
+ * agent/Makefile.am (common_libs): Remove ../gl/gnulib.a
+ * common/Makefile.am (t_common_ldadd): Ditto.
+ * dirmngr/Makefile.am (dirmngr_LDADD): Ditto.
+ (dirmngr_ldap_LDADD, dirmngr_client_LDADD): Ditto.
+ * g10/Makefile.am (needed_libs): Ditto.
+ * g13/Makefile.am (g13_LDADD): Ditto.
+ * kbx/Makefile.am (kbxutil_LDADD): Ditto.
+ ($(PROGRAMS)): Ditto.
+ * scd/Makefile.am (scdaemon_LDADD): Ditto.
+ * sm/Makefile.am (common_libs): Ditto.
+ * tools/Makefile.am (common_libs, commonpth_libs): Ditto.
+
+ * agent/gpg-agent.c: Remove "mkdtemp.h"
+ * g10/exec.c: Ditto.
+ * scd/scdaemon.c: Ditto.
+ * tools/symcryptrun.c: Ditto.
+ * common/sysutils.c: Remove "setenv.h"
+
+ * common/t-timestuff.c: Use putenv if setenv is not available.
+
+2014-11-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove warning message for non-implemented search modes.
+ * kbx/keybox-search.c (keybox_search): Silently ignore.
+ * doc/specify-user-id.texi: Docuement '@", '+', and '.' search
+ prefixes.
+
+ w32: Fix http access module.
+ * common/http.c (write_server) [W32]: Rework to use send() instead of
+ write even when build with npth.
+ (cookie_read) [W32]: Rework to use recv() instead of read even when
+ build with npth.
+
+ build: Add method to use a custom swdb.lst and use adns with Windows.
+ * build-aux/getswdb.sh: Add option --skip-verify.
+ * build-aux/speedo.mk: Add config var CUSTOM_SWDB. Tage adns version
+ from swdb and build for Windows with adns.
+
+ build: Improve test for ADNS.
+ * configure.ac <adns>: Use adns_free as probe function for libadns.
+ (HAVE_ADNS_FREE): Remove bogus tests to set this and remove the macro.
+ (ADNSLIBS): Do not ac_subst - it is only used within configure.
+
+2014-11-05 Werner Koch <wk at gnupg.org>
+
+ speedo: Append the date to the Windows installer.
+ * build-aux/speedo.mk (BUILD_DATESTR): New.
+ (dist-source, installer): Use it.
+
+ Release 2.1.0.
+
+ Avoid sign extension when shifting the MSB.
+ * sm/fingerprint.c (gpgsm_get_short_fingerprint): Cast MSB before
+ shifting.
+ * g10/build-packet.c (delete_sig_subpkt): Ditto.
+
+2014-11-04 Werner Koch <wk at gnupg.org>
+
+ Remove all expired common CA certificates.
+ * doc/com-certs.pem: Remove certifciates.
+
+2014-11-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid extra pinentries for each subkey in --export-secret-keys.
+ * agent/command.c (cmd_export_key): Actually implement the cache_nonce
+ feature.
+ * g10/export.c (do_export_stream): Make use of a cache_nonce.
+
+ gpg: Fix endless loop in keylisting with fingerprint.
+ * g10/getkey.c (getkey_next): Disable cache.
+
+ gpg: Minor cleanup for key listing related code.
+ * g10/getkey.c (get_pubkey_next): Divert to getkey_next.
+ (get_pubkey_end): Move code to getkey_end.
+ * g10/keydb.c (keydb_search_reset): Add a debug statement.
+ (dump_search_desc): Add arg HD and print the handle.
+
+ gpg: Do not show an useless passphrase prompt in batch mode.
+ * g10/keygen.c: Remove unused PASSPHRASE related code.
+ (proc_parameter_file): Remove useless asking for a passphrase in batch
+ mode.
+
+2014-10-31 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove superfluous check for Libgcrypt >= 1.4.0.
+ * g10/gpg.c (main): Remove check.
+
+ kbx: Let keydb_search skip unwanted blobs.
+ * kbx/keybox.h (keybox_blobtype_t): New.
+ * kbx/keybox-defs.h (BLOBTYPE_*): Replace by KEYBOX_BLOBTYPE_*.
+ * kbx/keybox-search.c (keybox_search): Add arg want_blobtype and skip
+ non-matching blobs.
+ * sm/keydb.c (keydb_search): Pass KEYBOX_BLOBTYPE_X509 to keybox_search.
+ * g10/keydb.c (keydb_search): Pass KEYBOX_BLOBTYPE_PGP to keybox_search.
+
+ gpg: Fix --rebuild-keydb-caches.
+ * g10/parse-packet.c (parse_key): Store even unsupported packet
+ versions.
+ * g10/keyring.c (keyring_rebuild_cache): Do not copy keys with
+ versions less than 4.
+
+ gpg: Fix testing for secret key availability.
+ * g10/getkey.c (have_secret_key_with_kid): Do not change the search
+ mode.
+
+ build: Avoid distributing backup files etc.
+ * Makefile.am (EXTRA_DIST): Do not include directories.
+
+2014-10-30 Werner Koch <wk at gnupg.org>
+
+ tests: Speed up the genkey1024.test by using not so strong random.
+ * agent/gpg-agent.c (oDebugQuickRandom): New.
+ (opts): New option --debug-quick-random.
+ (main): Use new option.
+ * common/asshelp.c (start_new_gpg_agent): Add hack to pass an
+ additional argument for the agent name.
+ * tests/openpgp/defs.inc: Pass --debug-quick-random to the gpg-agent
+ starting parameters.
+ * tests/openpgp/version.test: Ditto.
+
+2014-10-29 Werner Koch <wk at gnupg.org>
+
+ common: Check option arguments for a valid range.
+ * common/argparse.h (ARGPARSE_INVALID_ARG): New.
+ * common/argparse.c: Include limits h and errno.h.
+ (initialize): Add error strings for new error constant.
+ (set_opt_arg): Add range checking.
+
+ Fix stdint.h problem for Apple.
+ * gl/stdint_.h [__APPLE__]: Include hack.
+
+2014-10-27 Werner Koch <wk at gnupg.org>
+
+ speedo: Fixes for native build.
+ * build-aux/speedo.mk (TARGETOS): Init with empty string.
+ (speedo_pkg_gnupg_configure): Use --enable-gpg2-is-gpg only for w32.
+ (INST_VERSION, INST_PROD_VERSION): Create only for w32.
+
+2014-10-24 Werner Koch <wk at gnupg.org>
+
+ agent: Support pinentries with integrated repeat passphrase feature.
+ * agent/agent.h (struct pin_entry_info_s): Add fields repeat_okay and
+ with_repeat.
+ * agent/call-pinentry.c (close_button_status_cb): Rewrite and check
+ for PIN_REPEAT. Change users to check only the relevant bit.
+ (agent_askpin): Support repeat logic of new Pinentries.
+
+ * agent/command-ssh.c (ssh_identity_register): Use the new repeat
+ feature.
+ * agent/genkey.c (agent_ask_new_passphrase): Ditto.
+
+2014-10-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Silence "packet with obsolete versoin" warnings.
+ * g10/parse-packet.c (parse_key): Print warning only in very verbose
+ mode.
+
+ gpg: Make card key generation work again.
+ * g10/call-agent.c (agent_scd_learn): Rename from agent_learn.
+ (agent_learn): New.
+ * g10/keygen.c (gen_card_key): Call new agent-learn.
+
+2014-10-17 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Allow building without LDAP support.
+ * configure.ac: Add option --disable-ldap.
+ (USE_LDAP): New ac_define and am_conditional.
+ * dirmngr/Makefile.am: Take care of USE_LDAP.
+ * dirmngr/dirmngr.c (!USE_LDAP): Make all ldap options dummy options
+ and do not call any ldap function.
+ * dirmngr/server.c (!USE_LDAP): Do not call any ldap function.
+ * dirmngr/crlfetch.c (!USE_LDAP): Ditto.
+
+ w32: Set SYSROOT to help finding config scripts.
+ * autogen.sh <build-w32>: Set SYSROOT.
+
+ gpg: Remove all support for v3 keys and always create v4-signatures.
+ * g10/build-packet.c (do_key): Remove support for building v3 keys.
+ * g10/parse-packet.c (read_protected_v3_mpi): Remove.
+ (parse_key): Remove support for v3-keys. Add dedicated warnings for
+ v3-key packets.
+ * g10/keyid.c (hash_public_key): Remove v3-key support.
+ (keyid_from_pk): Ditto.
+ (fingerprint_from_pk): Ditto.
+
+ * g10/options.h (opt): Remove fields force_v3_sigs and force_v4_certs.
+ * g10/gpg.c (cmd_and_opt_values): Remove oForceV3Sigs, oNoForceV3Sigs,
+ oForceV4Certs, oNoForceV4Certs.
+ (opts): Turn --force-v3-sigs, --no-force-v3-sigs, --force-v4-certs,
+ --no-force-v4-certs int dummy options.
+ (main): Remove setting of the force_v3_sigs force_v4_certs flags.
+ * g10/revoke.c (gen_revoke, create_revocation): Always create v4 certs.
+ * g10/sign.c (hash_uid): Remove support for v3-signatures
+ (hash_sigversion_to_magic): Ditto.
+ (only_old_style): Remove this v3-key function.
+ (write_signature_packets): Remove support for creating v3-signatures.
+ (sign_file): Ditto.
+ (sign_symencrypt_file): Ditto.
+ (clearsign_file): Ditto. Remove code to emit no Hash armor line if
+ only v3-keys are used.
+ (make_keysig_packet): Remove arg SIGVERSION and force using
+ v4-signatures. Change all callers to not pass a value for this arg.
+ Remove all v3-key related code.
+ (update_keysig_packet): Remove v3-signature support.
+ * g10/keyedit.c (sign_uids): Always create v4-signatures.
+
+ * g10/textfilter.c (copy_clearsig_text): Remove arg pgp2mode and
+ change caller.
+
+2014-10-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove extra RSA import status line.
+ * g10/import.c (stats_s): Remove field "imported_rsa".
+ (import_print_stats): Do not print separate value for RSA.
+ (import_one): Remove the RSA counter.
+
+ gpg: Fix informative printing of user ids.
+ * g10/getkey.c (keyid_list): Add field "fpr".
+ (cache_user_id): Store fpr and check for dups only by fpr.
+ (get_pubkey_byfpr): New.
+ (get_user_id_string): Make static and use xasprintf.
+ (get_long_user_id_string): Use xasprintf.
+ (get_user_id_byfpr): New.
+ (get_user_id_byfpr_native): New.
+ * g10/keyid.c (fingerprint_from_pk): Make arg RET_LEN optional.
+ * g10/import.c (import_one): Use get_user_id_byfpr_native.
+
+ gpg: Allow importing keys with duplicated long key ids.
+ * g10/keydb.c (keydb_handle): Add field no_caching.
+ (keyblock_cache): Repalce field kid by fpr.
+ (keydb_disable_caching): New.
+ (keydb_search): Use the fingerprint as cache index.
+
+ * g10/import.c (import_one): Use the fingerprint and not the kid to
+ lookup the key. Call keydb_disable_caching beofre re-searching for
+ update.
+
+ * tests/openpgp/import.test: Add a test case.
+
+ tests: Speed up conventional encryption tests for gpg.
+ * tests/openpgp/conventional-mdc.test: Add an s2k-count option.
+ * tests/openpgp/conventional.test: Ditto.
+
+2014-10-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Minor change for better readability.
+ * g10/build-packet.c (write_version): Remove.
+ (do_pubkey_enc, do_onepass_sig): Write version directly.
+
+2014-10-10 Werner Koch <wk at gnupg.org>
+
+ doc: Fix a man page rendering problem.
+ * doc/gpg-agent.texi (Agent Configuration): Fix rendering of the
+ sshcontrol example.
+
+2014-10-10 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: Add build and runtime support for larger RSA keys.
+ * configure.ac: Added --enable-large-secmem option.
+ * g10/options.h: Add opt.flags.large_rsa.
+ * g10/gpg.c: Contingent on configure option: adjust secmem size,
+ add gpg --enable-large-rsa, bound to opt.flags.large_rsa.
+ * g10/keygen.c: Adjust max RSA size based on opt.flags.large_rsa
+ * doc/gpg.texi: Document --enable-large-rsa.
+
+2014-10-09 Werner Koch <wk at gnupg.org>
+
+ gpg: Skip overlong keys and a print a warning.
+ * kbx/keybox-search.c (keybox_search): Add arg r_skipped and skip too
+ long blobs.
+ * sm/keydb.c (keydb_search): Call keybox_search with a dummy param.
+ * g10/keydb.c (struct keydb_handle): Add field skipped_long_blobs.
+ (keydb_search_reset): Reset that field.
+ (keydb_search): Update that field.
+ (keydb_get_skipped_counter): New.
+ * g10/keylist.c (list_all): Print count of skipped keys.
+
+ gpg: Sync keylist output and warning messages.
+ * g10/keylist.c (list_all): Flush stdout before logging.
+ * g10/misc.c (print_pubkey_algo_note): Ditto.
+ (print_cipher_algo_note): Ditto.
+ (print_digest_algo_note): Ditto.
+ (print_md5_rejected_note): Ditto.
+
+ kbx: Fix handling of overlong keys.
+ * kbx/keybox-file.c (IMAGELEN_LIMIT): Change limit from 10^6 to 2MiB.
+ (_keybox_read_blob2): Skip too long record records.
+ (_keybox_write_blob): Do not accept too long record.
+ * kbx/keybox-dump.c (file_stats_s): Add field skipped_long_blobs.
+ (_keybox_dump_file): Print new counter.
+ (_keybox_dump_file): Skip too long records.
+ ----
+
+ To test this feature you may set the limit back to 1MiB and use key
+ F7F0E70F307D56ED which is in my local copy close to 2MiB. Without
+ this patch it was possible to import the key but access to that key
+ and all keys stored after it was not possible.
+
+ gpg: Take care to use pubring.kbx if it has ever been used.
+ * kbx/keybox-defs.h (struct keybox_handle): Add field for_openpgp.
+ * kbx/keybox-file.c (_keybox_write_header_blob): Set openpgp header
+ flag.
+ * kbx/keybox-blob.c (_keybox_update_header_blob): Add arg for_openpgp
+ and set header flag.
+ * kbx/keybox-init.c (keybox_new): Rename to do_keybox_new, make static
+ and add arg for_openpgp.
+ (keybox_new_openpgp, keybox_new_x509): New. Use them instead of the
+ former keybox_new.
+ * kbx/keybox-update.c (blob_filecopy): Add arg for_openpgp and set the
+ openpgp header flags.
+
+ * g10/keydb.c (rt_from_file): New. Factored out and extended from
+ keydb_add_resource.
+ (keydb_add_resource): Switch to the kbx file if it has the openpgp
+ flag set.
+
+ * kbx/keybox-dump.c (dump_header_blob): Print header flags.
+
+2014-10-09 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ Avoid unnecessary library linkage.
+ * dirmngr/Makefile.am: Avoid $(DNSLIBS) for dirmngr_ldap
+ * g10/Makefile.am: $(LIBREADLINE) is only for gpg2; gpgv2 does not
+ need $(LIBASSUAN_LIBS)
+ * sm/Makefile.am: gpgsm does not need $(ZLIBS)
+ * tools/Makefile.am: gpgconf does not need $(NPTH_LIBS)
+
+2014-10-08 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid error exit if keygrip computations fails in a key listing.
+ * g10/keyid.c (keygrip_from_pk): Use log_info and clear array on error.
+
+2014-10-03 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.0-beta864.
+
+ gpg: Allow creating a cert-only primary key.
+ * g10/keygen.c (ask_key_flags): Allow a 'c' in direct entry.
+
+ build: Add configure options --disable-{ntb,gnu}tls.
+ * configure.ac: Add --disable-ntbtls and --disable-gnutls.
+
+2014-10-03 Andre Heinecke <aheinecke at intevation.de>
+
+ gpg: Check gpg-agent version before 2.1 migration.
+ * g10/call-agent.c, g10/call-agent.h (agent_get_version): New.
+ * g10/migrate.c (migrate_secring): Abort migration if
+ agent_get_version returns not at least 2.1.0
+
+2014-10-03 Werner Koch <wk at gnupg.org>
+
+ po: Update German translation.
+
+ Remove support for the GPG_AGENT_INFO envvar.
+ * agent/agent.h (opt): Remove field use_standard_socket.
+ * agent/command.c (cmd_killagent): Always allow killing.
+ * agent/gpg-agent.c (main): Turn --{no,}use-standard-socket and
+ --write-env-file into dummy options. Always return true for
+ --use-standard-socket-p. Do not print the GPG_AGENT_INFO envvar
+ setting or set that envvar.
+ (create_socket_name): Simplify by removing non standard socket
+ support.
+ (check_for_running_agent): Ditto.
+ * common/asshelp.c (start_new_gpg_agent): Remove GPG_AGENT_INFO use.
+ * common/simple-pwquery.c (agent_open): Ditto.
+ * configure.ac (GPG_AGENT_INFO_NAME): Remove.
+ * g10/server.c (gpg_server): Do not print the AgentInfo comment.
+ * g13/server.c (g13_server): Ditto.
+ * sm/server.c (gpgsm_server): Ditto.
+ * tools/gpgconf.c (main): Simplify by removing non standard socket
+ support.
+
+2014-10-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix regression removing SHA256.
+ * g10/misc.c (map_md_openpgp_to_gcry): Always use SHA256.
+
+ First changes for future use of NTBTLS.
+ * configure.ac (NEED_NTBTLS_ABI, NEED_NTBTLS_VERSION): New.
+ (HTTP_USE_NTBTLS): New. Prefer over GNUTLS.
+ * m4/ntbtls.m4: New.
+ * m4/Makefile.am (EXTRA_DIST): Add new file.
+ * common/http.c: Add conditionals to eventually use NTBTLS.
+
+ build: Update m4 scripts.
+ * m4/gpg-error.m4: Update from Libgpg-error git master.
+ * m4/libgcrypt.m4: Update from Libgcrypt git master.
+ * configure.ac: Declare SYSROOT a precious variable. Add extra error
+ message for library configuration mismatches.
+
+2014-09-29 Werner Koch <wk at gnupg.org>
+
+ doc: Remove GnuPG-1 related parts from gpg.texi.
+ * doc/Makefile.am (YAT2M_OPTIONS): Add 2.1 to the source info.
+ * doc/gpg.texi: Remove gpg1 related texts.
+
+2014-09-27 Werner Koch <wk at gnupg.org>
+
+ gpg: Default to SHA-256 for all signature types on RSA keys.
+ * g10/main.h (DEFAULT_DIGEST_ALGO): Use SHA256 in --gnupg and SHA1 in
+ strict RFC or PGP modes.
+ * g10/sign.c (make_keysig_packet): Use DEFAULT_DIGEST_ALGO also for
+ RSA key signatures.
+ * configure.ac: Do not allow to disable sha256.
+
+ gpg: Simplify command --gen-key and add --full-gen-key.
+ * g10/gpg.c (aFullKeygen): New.
+ (opts): Add command --full-key-gen.
+ (main): Implement it.
+ * g10/keygen.c (DEFAULT_STD_ALGO): Replace wrong GCRY_PK_RSA although
+ the value is identical.
+ (DEFAULT_STD_CURVE): New.
+ (DEFAULT_STD_SUBALGO): New.
+ (DEFAULT_STD_SUBKEYSIZE): New.
+ (DEFAULT_STD_SUBCURVE): New.
+ (quick_generate_keypair): Use new macros here.
+ (generate_keypair): Add arg "full" and fix call callers. Do not ask
+ for keysize in non-full node.
+ (ask_user_id): Add arg "full" and simplify for non-full mode.
+
+2014-09-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Add shortcut for setting key capabilities.
+ * g10/keygen.c (ask_key_flags): Add shortcut '='.
+ * doc/help.txt (gpg.keygen.flags): New.
+
+2014-09-25 Werner Koch <wk at gnupg.org>
+
+ gpg: Do not always print dashes in obsolete_option.
+ * g10/gpg.c (main): Pass option names to obsolete_option without
+ double dash.
+ * g10/misc.c (obsolete_option, obsolete_scdaemon_option): Print double
+ dash only for command line options.
+
+2014-09-25 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: Warn about (but don't fail) on scdaemon options in gpg.conf.
+ * g10/gpg.c: Add config options that should belong in scdaemon.conf
+ * g10/main.h, g10/misc.c (obsolete_scdaemon_option): New.
+
+2014-09-22 Werner Koch <wk at gnupg.org>
+
+ speedo: Check that wget and gpgv are installed.
+ * build-aux/getswdb.sh: Check for required tools.
+
+ speedo: Autodetect sha1sum tools.
+ * build-aux/getswdb.sh: Add option --find-sha1sum.
+ * build-aux/speedo.mk (check-tools): New phony target. Not yet used.
+ (SHA1SUM): New var. Use it instead of sha1sum.
+
+ gpg: Create default keyring with .kbx suffix.
+ * g10/keydb.c (maybe_create_keyring_or_box): Rename arg for clarity.
+ (keydb_add_resource): Fix order of args to maybe_create_keyring_or_box
+ and check and create .kbx.
+
+2014-09-20 Werner Koch <wk at gnupg.org>
+
+ gpg: --delete-secret-key - check that a secret key exists.
+ * g10/delkey.c (do_delete_key): Check availibility of a secret key.
+
+ gpg: Make algorithm selection prompt for ECC more clear.
+ * g10/keygen.c (ask_algo): Change 9 to "ECC and ECC".
+
+2014-09-18 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.0-beta834.
+
+ speedo: Distribute needed files.
+ * Makefile.am (EXTRA_DIST): Add speedo stuff.
+
+ build: Enable gpgtar by default.
+
+ common: Do not build maintainer modules in non-maintainer mode.
+ * common/Makefile.am (module_maint_tests): Use only in maintainer
+ mode.
+ (t_common_cflags): New.
+
+ common: Remove superfluous statements.
+ * common/exechelp-posix.c: Remove weak pragmas.
+ * common/sexputil.c (make_canon_sexp_from_rsa_pk): Remove double
+ const.
+
+ g13: Avoid segv after pipe creation failure.
+ * g13/call-gpg.c (gpg_encrypt_blob): Init some vars in case of an
+ early error.
+ (gpg_decrypt_blob): Ditto.
+
+ scd: Fix int/short mismatch in format string of app-p15.c.
+ * scd/app-p15.c (parse_certid): Use snprintf and cast value.
+ (send_certinfo): Ditto.
+ (send_keypairinfo): Ditto.
+ (do_getattr): Ditto.
+
+ agent: Init a local variable in the error case.
+ * agent/pksign.c (do_encode_md): Init HASH on error.
+
+ agent: Remove left over debug output.
+ * agent/command-ssh.c (ssh_signature_encoder_eddsa): Remove debug
+ output.
+
+ agent: Silence compiler warning for a debug message.
+ * agent/call-pinentry.c (agent_query_dump_state): Use %p for
+ POPUP_TID.
+
+ sm: Silence compiler warnings.
+ * sm/certreqgen-ui.c (gpgsm_gencertreq_tty): Remove unused var I.
+ * sm/certreqgen.c (proc_parameters): Init PUBLIC to avoid compiler
+ warning.
+
+ gpg: Silence a compiler warning.
+ * g10/parse-packet.c (enum_sig_subpkt): Replace hack.
+
+ gpg: Replace a hash algo test function.
+ * g10/gpg.c (print_mds): Replace openpgp_md_test_algo.
+
+ speedo: Various fixes.
+ * build-aux/speedo.mk: Take zlib and bzip2 from ftp.gnupg.org. Minor
+ other fixes.
+
+2014-09-17 Werner Koch <wk at gnupg.org>
+
+ gpg: Print a warning if the subkey expiration may not be what you want.
+ * g10/keyedit.c (subkey_expire_warning): New.
+ (keyedit_menu): Call it when needed.
+
+ gpg: Improve passphrase caching.
+ * agent/cache.c (last_stored_cache_key): New.
+ (agent_get_cache): Allow NULL for KEY.
+ (agent_store_cache_hit): New.
+ * agent/findkey.c (unprotect): Call new function and try to use the
+ last stored key.
+
+ * g10/revoke.c (create_revocation): Add arg CACHE_NONCE and pass to
+ make_keysig_packet.
+ (gen_standard_revoke): Add arg CACHE_NONCE and pass to
+ create_revocation.
+ * g10/keygen.c (do_generate_keypair): Call gen_standard_revoke with
+ cache nonce.
+
+2014-09-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Use algorithm id 22 for EdDSA.
+ * common/openpgpdefs.h (PUBKEY_ALGO_EDDSA): Change to 22.
+ * g10/keygen.c (ask_curve): Reword the Curve25519 warning note.
+
+2014-09-11 Werner Koch <wk at gnupg.org>
+
+ gpg: Stop early on bogus old style comment packets.
+ * g10/parse-packet.c (parse_key): Take care of too short packets for
+ old style commet packets.
+
+2014-09-10 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Support https for KS_FETCH.
+ * dirmngr/ks-engine-hkp.c (cert_log_cb): Move to ...
+ * dirmngr/misc.c (cert_log_cb): here.
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Support 307-redirection
+ and https.
+
+ dirmngr: Fix the ks_fetch command for the http scheme.
+ * common/http.c (http_session_ref): Allow for NULL arg.
+
+2014-09-08 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix memory leak in ECC encryption.
+ * g10/pkglue.c (pk_encrypt): Fix memory leak and streamline error
+ handling.
+
+2014-09-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix export of NIST ECC keys.
+ * common/openpgp-oid.c (struct oidtable): New.
+ (openpgp_curve_to_oid): Rewrite and allow OID as input.
+ (openpgp_oid_to_curve): Make use of the new table.
+
+ agent: Fix import of OpenPGP EdDSA keys.
+ * agent/cvt-openpgp.c (get_keygrip): Special case EdDSA.
+ (convert_secret_key): Ditto.
+ (convert_transfer_key): Ditto.
+ (apply_protection): Handle opaque MPIs.
+
+ (do_unprotect): Check FLAG_OPAQUE instead of FLAG_USER1 before
+ unpacking an opaque mpi.
+
+2014-09-01 Kyle Butt <kylebutt at gmail.com>
+
+ gpg: Fix export of ecc secret keys by adjusting check ordering.
+ * g10/export.c (transfer_format_to_openpgp): Move the check against
+ PUBKEY_MAX_NSKEY to after the ECC code adjusts the number of
+ parameters.
+
+2014-09-01 Werner Koch <wk at gnupg.org>
+
+ agent: Allow key unprotection using AES-256.
+ * agent/protect.c (PROT_CIPHER): Rename to GCRY_CIPHER_AES128 for
+ clarity.
+ (do_decryption): Add args prot_cipher and prot_cipher_keylen. USe
+ them instead of the hardwired values.
+ (agent_unprotect): Change to use a table of protection algorithms.
+ Add AES-256 variant.
+
+2014-08-28 Werner Koch <wk at gnupg.org>
+
+ gpg: Do not show "MD5" and triplicated "RSA" in --version.
+ * g10/gpg.c (build_list_pk_test_algo): Ignore RSA aliases
+ (build_list_md_test_algo): Ignore MD5.
+
+ gpg: Do not show "MD5" and triplicated "RSA" in --version.
+ * g10/gpg.c (build_list_pk_test_algo): Ignore RSA aliases
+ (build_list_md_test_algo): Ignore MD5.
+
+2014-08-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove CAST5 from the default prefs and order SHA-1 last.
+ * g10/keygen.c (keygen_set_std_prefs): Update prefs.
+
+ Switch to the libgpg-error provided estream.
+ * configure.ac (NEED_GPG_ERROR_VERSION): Reguire 1.14.
+ (GPGRT_ENABLE_ES_MACROS): Define.
+ (estream_INIT): Remove.
+ * m4/estream.m4: Remove.
+ * common/estream-printf.c, common/estream-printf.h: Remove.
+ * common/estream.c, common/estream.h: Remove.
+ * common/init.c (_init_common_subsystems): Call gpgrt initialization.
+
+ gpg: Allow for positional parameters in the passphrase prompt.
+ * g10/passphrase.c (passphrase_get): Replace sprintf by xasprintf.
+
+2014-08-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix "can't handle public key algorithm" warning.
+ * g10/parse-packet.c (unknown_pubkey_warning): Check for encr/sign
+ capabilities.
+
+2014-08-19 Werner Koch <wk at gnupg.org>
+
+ speedo: Get version numbers from online database.
+ * build-aux/getswdb.sh: New.
+ * build-aux/speedo.mk: Get release version numbers from swdb.lst.
+
+ build: Create VERSION file via autoconf.
+ * Makefile.am (dist-hook): Remove creation of VERSION.
+ (EXTRA_DIST): Add VERSION.
+ * configure.ac: Let autoconf create VERSION.
+
+2014-08-18 Werner Koch <wk at gnupg.org>
+
+ gpg: Install the current release signing pubkey.
+ * g10/distsigkey.gpg: New.
+
+ agent: Return NO_SECKEY instead of ENONET for PKSIGN and others.
+ * agent/pksign.c (agent_pksign_do): Replace ENONET by NO_SECKEY.
+ * agent/findkey.c (agent_key_from_file): No diagnostic for NO_SECKEY.
+ * agent/pkdecrypt.c (agent_pkdecrypt): Replace checking for ENOENT.
+
+ kbx: Make user id and signature data optional for OpenPGP.
+ * kbx/keybox-blob.c (_keybox_create_openpgp_blob): Remove restriction.
+
+ gpg: Change default cipher for --symmetric from CAST5 to AES-128.
+ * g10/main.h (DEFAULT_CIPHER_ALGO): Chhange to AES or CAST5 or 3DES
+ depending on configure option.
+ * g10/gpg.c (main): Set opt.s2k_cipher_algo to DEFAULT_CIPHER_ALGO.
+
+ yat2m: Support @set and @value.
+ * doc/yat2m.c (variablelist): New.
+ (set_variable): New.
+ (macro_set_p): Also check the variables.
+ (proc_texi_cmd): Support the @value command.
+ (parse_file): Support the @set command.
+ (top_parse_file): Release variablelist.
+
+ yat2m: Support the $* command for man page rendering.
+
+2014-08-17 Werner Koch <wk at gnupg.org>
+
+ estream: Change license from GPL to LPGL.
+ * common/estream-printf.c, common/estream-printf.h: Change license.
+ * common/estream.c, common/estream.h: Ditto.
+
+2014-08-14 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.0-beta783.
+
+ po: Update the German (de) translation.
+
+ sm: Create homedir and lock empty keybox creation.
+ * sm/gpgsm.h (opt): Add field "no_homedir_creation".
+ * sm/gpgsm.c (main): Set it if --no-options is used.
+ * sm/keydb.c (try_make_homedir): New. Similar to the one from
+ g10/openfile.c.
+ (maybe_create_keybox): New. Similar to the one from g10/keydb.c.
+ (keydb_add_resource): Replace some code by maybe_create_keybox.
+
+ gpg: Screen keyserver responses.
+ * g10/main.h (import_screener_t): New.
+ * g10/import.c (import): Add screener callbacks to param list.
+ (import_one): Ditto.
+ (import_secret_one): Ditto.
+ (import_keys_internal): Ditto.
+ (import_keys_stream): Ditto.
+ * g10/keyserver.c (struct ks_retrieval_screener_arg_s): New.
+ (keyserver_retrieval_screener): New.
+ (keyserver_get): Pass screener to import_keys_es_stream().
+
+ scd: Minor changes to app-sc-hsm.
+ * scd/app-sc-hsm.c: Re-indendet some parts and set some vars to NULL
+ after xfree for improbed robustness.
+ (read_ef_prkd): Replace serial operator by blocks for better
+ readability.
+ (apply_PKCS_padding): Rewrite for easier auditing.
+ (strip_PKCS15_padding): Ditto. Add stricter check on SRCLEN.
+
+ gpg: Disable an MD5 workaround for pgp2 by default.
+ * g10/sig-check.c (do_check): Move some code to ...
+ * g10/misc.c (print_md5_rejected_note): new function.
+ * g10/mainproc.c (proc_tree, proc_plaintext): Enable MD5 workaround
+ only if option --allow-weak-digest-algos is used.
+
+ gpg: Remove options --pgp2 and --rfc1991.
+ * g10/gpg.c (oRFC1991, oPGP2): Remove
+ (opts): Remove --pgp2 and --rfc1991.
+ * g10/options.h (CO_PGP2, CO_RFC1991): Remove. Remove all users.
+ (RFC2440, PGP2): Remove. Remove all code only enabled by these
+ conditions.
+ * tests/openpgp/clearsig.test: Remove --rfc1991 test.
+
+ build: Fix autogen.sh base version hack.
+ * autogen.sh <find-version>: Fix.
+
+ gpg: Remove --compress-keys and --compress-sigs feature.
+ * g10/gpg.c (oCompressKeys, oCompressSigs): Remove.
+ (opts): Turn --compress-keys and --compress-signs in NOPs.
+ * g10/options.h (opt): Remove fields compress_keys and compress_sigs.
+ * g10/export.c (do_export): Remove compress_keys feature.
+ * g10/sign.c (sign_file): Remove compress_sigs feature.
+
+2014-08-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Add list-option "show-usage".
+ * g10/gpg.c (parse_list_options): Add "show-usage".
+ * g10/options.h (LIST_SHOW_USAGE): New.
+ * g10/keyid.c (usagestr_from_pk): Add arg FILL. Change caller.
+ * g10/keylist.c (list_keyblock_print): Print usage info.
+
+2014-08-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Make --with-colons work again for --search-keys.
+ * g10/keyserver.c (search_line_handler): Replace log_debug by
+ es_printf.
+
+2014-08-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+2014-07-25 Werner Koch <wk at gnupg.org>
+
+ scd: Minor and editorial changes to app-sc-hsm.c.
+ * scd/app-sc-hsm.c (select_and_read_binary): Use SW_ macro.
+ (parse_certid): Remove useless test.
+ (send_certinfo, send_keypairinfo): Shrink malloc to the needed size.
+ (do_getattr): Ditto.
+ (verify_pin): Use SW_ macro.
+ (do_decipher): Replace OFS variable and extend comment.
+
+ scd: Add a new status word code.
+ * scd/apdu.h (SW_REF_DATA_INV): New.
+ * scd/apdu.c (apdu_strerror): Add string.
+
+2014-07-25 Andreas Schwier <andreas.schwier at cardcontact.de>
+
+ scd: Support for SmartCard-HSM.
+ * scd/app-sc-hsm.c: New.
+ * scd/app.c (select_application, get_supported_applications): Register
+ new app.
+
+2014-07-25 Werner Koch <wk at gnupg.org>
+
+ gpg: Switch to an EdDSA format with prefix byte.
+ * g10/keygen.c (gen_ecc): USe "comp" for EdDSA.
+
+2014-07-23 Werner Koch <wk at gnupg.org>
+
+ agent: Show just one warning with all failed passphrase constraints.
+ * agent/genkey.c (check_passphrase_constraints): Build a final warning
+ after all checks.
+
+ agent: Only one confirmation prompt for an empty passphrase.
+ * agent/genkey.c (check_passphrase_constraints): Moev empty passphrase
+ check to the front.
+
+ gpg: Add command --quick-gen-key.
+ * g10/gpg.c (aQuickKeygen): New.
+ * g10/misc.c (is_valid_user_id): New stub.
+ * g10/keygen.c (quickgen_set_para): New.
+ (quick_generate_keypair): New.
+
+ common: Add cpr_get_answer_is_yes_def()
+ * g10/cpr.c (cpr_get_answer_is_yes): Factor code out to ....
+ (cpr_get_answer_is_yes_def): ...new.
+
+ gpg: Make --quick-sign-key promote local key signatures.
+ * g10/keyedit.c (sign_uids): Promote local sigs in quick mode.
+
+2014-07-22 Werner Koch <wk at gnupg.org>
+
+ scd: Do not use the pcsc-wrapper.
+ * scd/apdu.c (NEED_PCSC_WRAPPER): Do not define.
+ * scd/Makefile.am (libexec_PROGRAMS): Remove gnupg-pcsc-wrapper
+ (gnupg_pcsc_wrapper_SOURCES): Remove.
+ (gnupg_pcsc_wrapper_LDADD): Remove.
+ (gnupg_pcsc_wrapper_CFLAGS): Remove.
+
+2014-07-21 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve --list-packets output for faulty packets.
+ * g10/parse-packet.c: Add list_mode output for certain failures.
+
+ gpg: Cap size of attribute packets at 16MB.
+ * g10/parse-packet.c (parse_attribute): Avoid xmalloc failure and cap
+ size of packet.
+
+2014-07-03 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.0-beta751.
+
+ gpg: Make show-uid-validity the default.
+
+ tests: Fix end-of-all-ticks test for Western locales.
+ * common/t-timestuff.c (test_timegm): Use timegm if available.
+ (main): Set TX to UTC if timegm is not available.
+
+2014-07-03 Kristian Fiskerstrand <kf at sumptuouscapital.com>
+
+ gpg: Spelling error.
+
+2014-06-30 Werner Koch <wk at gnupg.org>
+
+ gpg: Auto-create revocation certificates.
+ * configure.ac (GNUPG_OPENPGP_REVOC_DIR): New config define.
+ * g10/revoke.c (create_revocation): Add arg "leadin".
+ (gen_standard_revoke): New.
+ * g10/openfile.c (get_openpgp_revocdir): New.
+ (open_outfile): Add MODE value 3.
+ * g10/keyid.c (hexfingerprint): New.
+ * g10/keygen.c (do_generate_keypair): Call gen_standard_revoke.
+
+ estream: Fix minor glitch in "%.*s" format.
+ * common/estream-printf.c (pr_string): Take care of non-nul terminated
+ strings.
+
+ gpg: Rearrange code in gen_revoke.
+ * g10/revoke.c (gen_revoke): Factor some code out to ...
+ (create_revocation): new.
+
+ gpg: Create exported secret files and revocs with mode 700.
+ * common/iobuf.c (direct_open): Add arg MODE700.
+ (iobuf_create): Ditto.
+ * g10/openfile.c (open_outfile): Add arg RESTRICTEDPERM. Change call
+ callers to pass 0 for it.
+ * g10/revoke.c (gen_desig_revoke, gen_revoke): Here pass true for new
+ arg.
+ * g10/export.c (do_export): Pass true for new arg if SECRET is true.
+
+ common: Minor code cleanup for a legacy OS.
+ * common/iobuf.c (direct_open) [__riscos__]: Simply cpp conditionals.
+
+2014-06-27 Werner Koch <wk at gnupg.org>
+
+ speedo: Fix the w32 installer name.
+
+ po: Update some strings of the French (fr) translation.
+
+ po: Update the German (de) translation.
+
+ agent: Adjust for changed npth_eselect under W32.
+ * agent/gpg-agent.c (handle_connections) [W32]: Make events_set an
+ unsigned int to match the changed prototype.
+
+ dirmngr: Use the homedir based socket also under W32.
+ * common/homedir.c (dirmngr_user_socket_name): Use same code for all
+ platforms.
+
+2014-06-27 Yuri Chornoivan <yurchor at ukr.net>
+
+ po: Update and enable Ukrainian (uk) translation.
+
+ Fix typos in messages.
+
+2014-06-27 Werner Koch <wk at gnupg.org>
+
+ build: Remove unused options.
+ * configure.ac: Remove option --build-agent-only.
+ (FAKE_CURL, GPGKEYS_CURL): Remove check for cURL
+ (GPGKEYS_MAILTO): Remove ac_subst but keep the currently unused
+ SENDMAIL check.
+ (GPGKEYS_KDNS): Remove ac_subst.
+ * autogen.rc (final_info): Remove suggestion to use the removed option
+ --enable-mailto.
+
+2014-06-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Add pinpad support for REINER SCT cyberJack go.
+ * scd/ccid-driver.h (VENDOR_REINER, CYBERJACK_GO): New.
+ * scd/ccid-driver.c (ccid_transceive_secure): Handle the case for
+ VENDOR_REINER. Original work was by Alina Friedrichsen (tiny change).
+
+2014-06-27 Werner Koch <wk at gnupg.org>
+
+ scd: Support reader Gemalto IDBridge CT30.
+ * scd/ccid-driver.h (GEMPC_CT30): New product id.
+ * scd/ccid-driver.c (parse_ccid_descriptor): Add quirk for that
+ reader.
+
+2014-06-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Limit keysize for unattended key generation to useful values.
+ * g10/keygen.c (gen_elg): Enforce keysize 1024 to 4096.
+ (gen_rsa): Enforce keysize 1024 to 4096.
+ (gen_dsa): Enforce keysize 768 to 3072.
+
+ Enable DNS SRV records again.
+ * configure.ac (GPGKEYS_HKP, GPGKEYS_FINGER): Remove ac_subst.
+ (use_dns_srv): Make test work.
+
+ agent: Fix export of RSA keys to OpenPGP.
+ * agent/cvt-openpgp.c (convert_transfer_key): Fix sexp build format
+ string.
+
+ gpg,gpgsm: Simplify wrong_args function.
+
+ speedo: "make clean-gnupg" may not remove the source.
+ * build-aux/speedo.mk (clean-$(1)): Take care of gnupg.
+
+ gpgsm: Fix default config name.
+
+2014-06-25 Werner Koch <wk at gnupg.org>
+
+ doc: Improve the rendering of the manual.
+
+ doc: Update for modern makeinfo.
+ * doc/texi.css: Remove.
+ * doc/Makefile.am (AM_MAKEINFOFLAGS): Use --css-ref.
+
+ gpg: Allow key-to-card upload for cert-only keys.
+ * g10/card-util.c (card_store_subkey): Allo CERT usage for key 0.
+
+2014-06-24 Werner Koch <wk at gnupg.org>
+
+ doc: Add conditionals for GnuPG-1.
+
+2014-06-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Make export of ECC keys work again.
+ * agent/cvt-openpgp.c (convert_to_openpgp): Use the curve name instead
+ of the curve parameters.
+ * g10/export.c (canon_pubkey_algo): Rename to ...
+ (canon_pk_algo): this. Support ECC.
+ (transfer_format_to_openpgp): Expect curve name.
+
+ gpg: Avoid infinite loop in uncompressing garbled packets.
+ * g10/compress.c (do_uncompress): Limit the number of extra FF bytes.
+
+2014-06-17 Kristian Fiskerstrand <kf at sumptuouscapital.com>
+
+ gpg: Fix a couple of spelling errors.
+
+2014-06-17 Werner Koch <wk at gnupg.org>
+
+ speedo: Support building from dist-source generated tarball.
+
+2014-06-13 Werner Koch <wk at gnupg.org>
+
+ http: Print human readable GNUTLS status.
+ * common/http.c (send_gnutls_bye): Take care of EAGAIN et al.
+ (http_verify_server_credentials): Print a human readable status.
+
+2014-06-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve the output of --list-packets.
+ * g10/parse-packet.c (parse): Print packet meta info in list mode.
+
+2014-06-11 Werner Koch <wk at gnupg.org>
+
+ speedo: Improve building of the w32 installer.
+ * build-aux/speedo.mk: Change name of build directory to PLAY.
+ Improve the dist-source target.
+ * build-aux/speedo/w32/gdk-pixbuf-loaders.cache: Add a blank
+ line (plus comment).
+ * build-aux/speedo/w32/inst.nsi: Change name of file to gnupg-w32-*.
+ Install more tools.
+
+2014-06-10 Werner Koch <wk at gnupg.org>
+
+ speedo: Revamped speedo and include a w32 installer.
+ * build-aux/speedo/: New.
+ * build-aux/speedo/w32/: New.
+
+ build: Add more options to autogen.sh.
+ * autogen.sh: Add options --print-host and --print-build.
+
+ w32: Fix build problem with dirmngr.
+ * dirmngr/ks-engine-hkp.c (EAI_SYSTEM) [W32]: Add replacement
+ constant.
+
+ gpg: Use more specific reason codes for INV_RECP.
+ * g10/pkclist.c (find_and_check_key, build_pk_list): Use more specific
+ reasons codes for INV_RECP.
+
+2014-06-06 Werner Koch <wk at gnupg.org>
+
+ Improve the beta number generation.
+ * autogen.sh: Add option --find-version
+ * configure.ac: Rework the setting of the mym4_ variables.
+
+2014-06-05 Werner Koch <wk at gnupg.org>
+
+ Remove keyserver helper code.
+ * configure.ac: Remove keyserver helper related stuff.
+ * Makefile.am (SUBDIRS): Remove keyserver.
+ * keyserver/Makefile.am: Remove.
+
+ gpg: Require confirmation for --gen-key with experimental curves.
+ * g10/keygen.c (ask_curve): Add arg both. Require confirmation for
+ Curve25519.
+
+ gpg: Auto-migrate existing secring.gpg.
+ * g10/migrate.c: New.
+ * g10/import.c (import_old_secring): New.
+ (import_one): Add arg silent.
+ (transfer_secret_keys): Add arg batch.
+ (import_secret_one): Add args batch and for_migration.
+ * g10/gpg.c (main): Call migration function.
+
+2014-06-04 Werner Koch <wk at gnupg.org>
+
+ gpgsm: Fix commit be07ed65.
+ * sm/server.c (option_handler): Use "with-secret".
+
+2014-06-03 Werner Koch <wk at gnupg.org>
+
+ Add new option --with-secret.
+ * g10/gpg.c: Add option --with-secret.
+ * g10/options.h (struct opt): Add field with_secret.
+ * g10/keylist.c (public_key_list): Pass opt.with_secret to list_all
+ and list_one.
+ (list_all, list_one): Add arg mark_secret.
+ (list_keyblock_colon): Add arg has_secret.
+ * sm/gpgsm.c: Add option --with-secret.
+ * sm/server.c (option_handler): Add option "with-secret".
+ * sm/gpgsm.h (server_control_s): Add field with_secret.
+ * sm/keylist.c (list_cert_colon): Take care of with_secret. Also move
+ the token string from the wrong field 14 to 15.
+
+ gpgsm: New commands --export-secret-key-{p8,raw}
+ * sm/gpgsm.c: Add new commands.
+ * sm/minip12.c (build_key_sequence): Add arg mode.
+ (p12_raw_build): New.
+ * sm/export.c (export_p12): Add arg rawmode. Call p12_raw_build.
+ (gpgsm_p12_export): Ditto.
+ (print_short_info): Print the keygrip.
+
+2014-06-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid NULL-deref in default key listing.
+ * g10/keyid.c (hash_public_key): Take care of NULL keys.
+ * g10/misc.c (pubkey_nbits): Ditto.
+
+ gpg: Simplify default key listing.
+ * g10/mainproc.c (list_node): Rework.
+
+ gpg: Graceful skip reading of corrupt MPIs.
+ * g10/parse-packet.c (mpi_read): Change error message on overflow.
+
+ gpgsm: Handle re-issued CA certificates in a better way.
+ * sm/certchain.c (find_up_search_by_keyid): Consider all matching
+ certificates.
+ (find_up): Add some debug messages.
+
+ gpgsm: Add a way to save a found state.
+ * kbx/keybox-defs.h (keybox_found_s): New.
+ (keybox_handle): Factor FOUND out to above. Add saved_found.
+ * kbx/keybox-init.c (keybox_release): Release saved_found.
+ (keybox_push_found_state, keybox_pop_found_state): New.
+
+ * sm/keydb.c (keydb_handle): Add field saved_found.
+ (keydb_new): Init it.
+ (keydb_push_found_state, keydb_pop_found_state): New.
+
+ gpg: Fix bug parsing a zero length user id.
+ * g10/getkey.c (get_user_id): Do not call xmalloc with 0.
+
+ * common/xmalloc.c (xmalloc, xcalloc): Take extra precaution not to
+ pass 0 to the arguments.
+
+2014-05-19 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Print certificates on failed TLS verification.
+ * dirmngr/ks-engine-hkp.c (cert_log_cb): New.
+ (send_request): Set callback.
+
+ http: Add callback to help logging of server certificates.
+ * common/http.c (http_session_s): Add field cert_log_cb.
+ (http_session_set_log_cb): New.
+ (http_verify_server_credentials): Call callback.
+
+2014-05-16 Werner Koch <wk at gnupg.org>
+
+ keyserver: Improve support for hkps pools.
+ * dirmngr/ks-engine-hkp.c (hostinfo_s): Add fields cname, v4addr, and
+ v6addr.
+ (create_new_hostinfo): Clear them.
+ (my_getnameinfo): Add args numeric and r_isnumeric.
+ (is_ip_address): New.
+ (map_host): Add arg r_host. Rewrite the code to handle pools in a
+ special way.
+ (ks_hkp_print_hosttable): Change format of help info output.
+ (make_host_part): Add arg optional r_httphost.
+ (send_request): Add arg httphost.
+ (ks_hkp_search, ks_hkp_get, ks_hkp_put): Get httphost and pass it to
+ send_request.
+
+ http: Allow overriding of the Host header.
+ * common/http.c (http_open): Add arg httphost.
+ (http_open_document): Pass NULL for httphost.
+ (send_request): Add arg httphost. If given, use HTTPHOST instead of
+ SERVER. Use https with a proxy if requested.
+ (http_verify_server_credentials): Do not stop at the first error
+ message.
+ * dirmngr/ocsp.c (do_ocsp_request): Adjust call to http_open.
+ * keyserver/curl-shim.c (curl_easy_perform): Ditto.
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_help): Ditto.
+
+2014-05-14 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix uninitialized access to search descindex with gpg keyboxes.
+ * kbx/keybox-search.c (keybox_search): Add arg R_DESCINDEX. Chnage
+ both callers.
+ * g10/keydb.c (keydb_search): Always set DESCINDEX.
+
+ w32: Make make_absfilename work with drive letters.
+ * common/stringhelp.c (do_make_filename) [HAVE_DRIVE_LETTERS]: Fix.
+
+ gpg: Remove useless diagnostic in MDC verification.
+ * g10/decrypt-data.c (decrypt_data): Do not distinguish between a bad
+ MDC packer header and a bad MDC.
+
+ gpg: Fix glitch entering a full expiration time.
+ * g10/keygen.c (ask_expire_interval): Get the current time after the
+ prompt.
+
+2014-05-08 Werner Koch <wk at gnupg.org>
+
+ agent: Fix import of non-protected gpg keys.
+ * agent/cvt-openpgp.c (do_unprotect): Return an s-exp also for
+ non-protected keys.
+ (convert_from_openpgp_main): Do not call agent_askpin for a
+ non-protected key.
+
+ Make more use of *_NAME macros.
+ * configure.ac (GPG_DISP_NAME, GPGSM_DISP_NAME): New.
+ (GPG_AGENT_DISP_NAME, SCDAEMON_DISP_NAME): New.
+ (DIRMNGR_DISP_NAME, G13_DISP_NAME): New.
+ (GPGCONF_DISP_NAME): New.
+ (SCDAEMON_SOCK_NAME): New.
+ * common/argparse.c (show_help): Map description string.
+
+2014-05-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix auth key comment handling.
+ * agent/command-ssh.c (ssh_send_key_public): Handle the case with no
+ comment.
+
+2014-05-07 Werner Koch <wk at gnupg.org>
+
+ Make -jN work again.
+ * common/Makefile.am ($(PROGRAMS)): New rule
+ (t_http_LDADD): Use libcommontls.a without directory prefix.
+ * dirmngr/Makefile.am ($(PROGRAMS)): New rule.
+
+ gpg: Print the key algorithm/curve with signature info.
+ * g10/mainproc.c (check_sig_and_print): Print the name and curve.
+
+ gpg: Fix memleak in signature verification of bogus keys.
+ * g10/mainproc.c (check_sig_and_print): Factor common code out to ...
+ (print_good_bad_signature): here.
+
+ gpg: Mark experimental algorithms in the key listing.
+ * g10/keylist.c (list_keyblock_print): Remove duplicate curve name.
+ Print a note for experimental algorithms.
+ * g10/misc.c (print_pubkey_algo_note): Fix warning message.
+
+ gpg: Finish experimental support for Ed25519.
+ * agent/cvt-openpgp.c (try_do_unprotect_arg_s): Add field "curve".
+ (get_keygrip): Add and use arg CURVE.
+ (convert_secret_key): Ditto.
+ (convert_transfer_key): Ditto.
+ (get_npkey_nskey): New.
+ (prepare_unprotect): Replace gcrypt functions by
+ get_npkey_nskey. Allow opaque MPIs.
+ (do_unprotect): Use CURVE instead of parameters.
+ (convert_from_openpgp_main): Ditto.
+ (convert_to_openpgp): Simplify.
+ * g10/import.c (one_mpi_from_pkey): Remove.
+ (transfer_secret_keys): Rewrite to use the curve instead of the
+ parameters.
+ * g10/parse-packet.c (parse_key): Mark protected MPIs with USER1 flag.
+
+ * common/openpgp-oid.c (openpgp_curve_to_oid): Allow the use of
+ "NIST P-256" et al.
+ * g10/keygen.c (ask_curve): Add arg ALGO.
+ (generate_keypair): Rewrite the ECC key logic.
+
+ * tests/openpgp/ecc.test: Provide the "ecc" passphrase.
+
+ kbx: Add experimental support for EDDSA.
+ * kbx/keybox-openpgp.c (parse_key): Use algo constants and add
+ experimental support for EdDSA.
+
+ agent: Remove greeting message.
+ * agent/gpg-agent.c (main): Remove greeting. Make --no-greeting a
+ dummy.
+
+2014-05-06 Werner Koch <wk at gnupg.org>
+
+ Use "samethread" mode keyword for some es_fopenmem.
+ * dirmngr/ks-engine-hkp.c (armor_data): Add mode keyword.
+ * g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
+ * scd/atr.c (atr_dump): Ditto.
+
+2014-05-05 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Add support for hkps keyservers.
+ * dirmngr/dirmngr.c: Include gnutls.h.
+ (opts): Add --gnutls-debug and --hkp-cacert.
+ (opt_gnutls_debug, my_gnutls_log): New.
+ (set_debug): Set gnutls log level.
+ (parse_rereadable_options): Register a CA file.
+ (main): Init GNUTLS.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_help): Support hkps.
+ (send_request): Ditto.
+
+ http: Add reference counting to the session object.
+ * common/http.c (http_session_t): Add field "refcount".
+ (_my_socket_new, _my_socket_ref, _my_socket_unref): Add debug code.
+ (send_request, my_npth_read, my_npth_write): Use SOCK object for the
+ transport ptr.
+ (http_session_release): Factor all code out to ...
+ (session_unref): here. Deref SOCK.
+ (http_session_new): Init refcount and transport ptr.
+ (http_session_ref): New. Ref and unref all assignments.
+
+2014-05-02 Werner Koch <wk at gnupg.org>
+
+ http: Add HTTP_FLAG_FORCE_TLS and http_get_tls_info.
+ * common/http.c (http_parse_uri): Factor code out to ...
+ (parse_uri): here. Add arg FORCE_TLS.
+ (do_parse_uri): Ditto. Implement flag.
+ (http_get_tls_info): New.
+ (http_register_tls_ca): Allow clearing of the list.
+ (send_request): Use a default verification function.
+ * common/http.h (HTTP_FLAG_FORCE_TLS): New.
+ * common/t-http.c (main): Add several command line options.
+
+ common: Fix test for openpgp_oid_is_ed25519.
+ * common/t-openpgp-oid.c (test_openpgp_oid_is_ed25519): Add correct
+ value.
+
+ http: Revamp TLS API.
+ * configure.ac (NEED_GNUTLS_VERSION): New.
+ (HTTP_USE_GNUTLS, LIBGNUTLS_CFLAGS, LIBGNUTLS_LIBS): New ac_subst.
+
+ * common/http.h (http_session_t): New.
+ * common/http.c: Remove compatibility for gnutls < 3.0.
+ (http_session_s): New.
+ (cookie_s): Replace gnutls_session_t by http_session_t.
+ (tls_callback, tls_ca_certlist): New variables.
+ (my_socket_unref): Add preclose args.
+ (my_npth_read, my_npth_write): New.
+ (make_header_line): Fix bug using int* instead of char*.
+ (http_register_tls_callback): New.
+ (http_register_tls_ca): New.
+ (http_session_new): New.
+ (http_session_release): New.
+ (http_get_header_names): New.
+ (escape_data): Add hack to escape in forms mode.
+ (send_request) [HTTP_USE_GNUTLS]: Support SNI.
+ (send_request) [HTTP_USE_GNUTLS]: Fix use of make_header_line.
+ (send_gnutls_bye): New.
+ (cookie_close): Make use of preclose feature.
+ (http_verify_server_credentials): New.
+ (main) [TEST]: Remove test code.
+ * common/t-http.c: New.
+ * common/tls-ca.pem: New.
+ * common/Makefile.am (tls_sources): New. Move http code to here.
+ (libcommontls_a_SOURCES): New.
+ (libcommontlsnpth_a_SOURCES): New.
+ (EXTRA_DIST): Add tls-ca.pem
+ (module_maint_tests): Add t-http.
+ (t_http_SOURCES, t_http_CFLAGS, t_http_LDADD): New.
+
+ * dirmngr/Makefile.am (dirmngr_LDADD): Add libcommontlsnpth.
+
+ common: Cleanup the use of USE_NPTH and HAVE_NPTH macros.
+ * configure.ac (HAVE_NPTH): New ac_define.
+ * common/estream.c: Use USE_NPTH instead of HAVE_NPTH.
+ * common/http.c: Ditto. Replace remaining calls to pth by npth calls.
+ (connect_server): Remove useless _().
+ * common/exechelp-posix.c, common/exechelp-w32.c
+ * common/exechelp-w32ce.c: Use HAVE_PTH to include npth.h.
+ * common/init.c (_init_common_subsystems): Remove call to pth_init.
+ * common/sysutils.c (gnupg_sleep): Use npth_sleep.
+ * scd/ccid-driver.c (my_sleep): Ditto.
+
+2014-04-30 Werner Koch <wk at gnupg.org>
+
+ estream: Implement "samethread" mode keyword.
+ * src/estream.c (estream_internal): Add field SAMETHREAD.
+ (init_stream_lock, lock_stream, trylock_stream, unlock_stream): Use it.
+ (parse_mode): Add arg SAMETHREAD and parse that keyword.
+ (es_initialize): Rename to ...
+ (init_stream_obj): this. Add arg SAMETHREAD.
+ (es_create): Add arg SAMETHREAD. Call init_stream_lock after
+ init_stream_obj.
+ (doreadline): Call es_create with samethread flag.
+ (es_fopen, es_mopen, es_fopenmem, es_fopencookie, do_fdopen)
+ (do_fpopen, do_w32open): Implement "samethread" keyword.
+ (es_freopen): Take samthread flag from old stream.
+ (es_tmpfile): Call es)_create w/o samethread.
+
+ estream: Fix deadlock in es_fileno.
+ * src/estream.c (es_fileno_unlocked): Call the unlocked functions.
+
+ estream: Add debug code to the lock functions.
+ * common/estream.c (dbg_lock_0, dbg_lock_1, dbg_lock_1): New.
+
+ estream: Replace locking macros by functions.
+ * common/estream.c: Replace most macros.
+
+2014-04-28 NIIBE Yutaka <gniibe at fsij.org>
+
+ ECC Fixes.
+ * agent/cvt-openpgp.c (get_keygrip, convert_secret_key)
+ (convert_transfer_key): Follow newer (>= 1.6) libgcrypt API, which
+ does not distinguish the detail.
+ (do_unprotect, convert_from_openpgp_main): Don't call
+ map_pk_openpgp_to_gcry, as it's the value of libgcrypt API already and
+ not the value defined by OpenPGP.
+ (convert_to_openpgp): It's "ecc".
+ * agent/gpg-agent.c (map_pk_openpgp_to_gcry): Remove.
+ * g10/call-agent.c (agent_pkdecrypt): Fix off-by-one error.
+ * g10/pubkey-enc.c (get_it): Fix swapping the fields error.
+
+2014-04-22 Werner Koch <wk at gnupg.org>
+
+ gpg: Pass --homedir to gpg-agent.
+ * agent/gpg-agent.c (main): Make sure homedir is absolute.
+ * common/asshelp.c (lock_spawning): Create lock file with an absolute
+ name.
+ (start_new_gpg_agent): Use an absolute name for the socket and pass
+ option --homedir to the agent.
+ (start_new_dirmngr): Use an absolute name for the --homedir.
+
+ common: Add functions make_absfilename and make_absfilename_try.
+ * common/stringhelp.c (do_make_filename): Add modes 2 and 3.
+ (make_absfilename): New.
+ (make_absfilename_try): New.
+
+ common: Add function gnupg_getcwd.
+ * tools/gpg-connect-agent.c (gnu_getcwd): Move to ...
+ * common/sysutils.c (gnupg_getcwd): .. here.
+ * tools/gpg-connect-agent.c (get_var_ext): Use gnupg_getcwd.
+
+ gpg: Print a warning if GKR has hijacked gpg-agent.
+ * g10/call-agent.c (check_hijacking): New.
+ (start_agent): Call it.
+ (membuf_data_cb, default_inq_cb): Move more to the top.
+
+2014-04-17 Werner Koch <wk at gnupg.org>
+
+ gpg: New %U expando for the photo viewer.
+ * g10/photoid.c (show_photos): Set namehash.
+ * g10/misc.c (pct_expando): Add "%U" expando.
+
+ common: Add z-base-32 encoder.
+ * common/zb32.c: New.
+ * common/t-zb32.c: New.
+ * common/Makefile.am (common_sources): Add zb82.c
+ (module_tests): Add t-zb32.
+
+2014-04-16 Werner Koch <wk at gnupg.org>
+
+ Two minor code cleanups and one NULL deref on error fix.
+ * common/estream.c (es_freopen): Remove useless check for STREAM.
+ * kbx/keybox-blob.c (_keybox_create_x509_blob): Remove useless check
+ for BLOB.
+ * tools/sockprox.c (run_proxy): Do not fclose(NULL).
+
+2014-04-15 Werner Koch <wk at gnupg.org>
+
+ gpg: Re-enable secret key deletion.
+ * g10/call-agent.c (agent_delete_key): New.
+ * g10/keydb.h (FORMAT_KEYDESC_DELKEY): New.
+ * g10/passphrase.c (gpg_format_keydesc): Support new format.
+ * g10/delkey.c (do_delete_key): Add secret key deletion.
+
+ gpg: Re-indent a file.
+ * g10/delkey.c: Re-indent.
+ (do_delete_key, delete_keys): Change return type top gpg_error_t.
+
+ gpg: Fix regression in secret key export.
+ * agent/cvt-openpgp.c (convert_to_openpgp): Fix use
+ gcry_sexp_extract_param.
+ * g10/export.c (do_export_stream): Provide a proper prompt to the
+ agent.
+
+ gpg: Change pinentry prompt to talk about "secret key".
+ * g10/passphrase.c (gpg_format_keydesc): Add mode 2. Change strings.
+ * g10/keydb.h (FORMAT_KEYDESC_NORMAL, FORMAT_KEYDESC_IMPORT)
+ (FORMAT_KEYDESC_EXPORT): New. Use them for clarity.
+
+ agent: Add command DELETE_KEY.
+ * agent/command.c (cmd_delete_key): New.
+ * agent/findkey.c (modify_description): Add '%C' feature.
+ (remove_key_file): New.
+ (agent_delete_key): New.
+ * agent/command-ssh.c (search_control_file): Make arg R_DISABLE
+ optional.
+
+ * configure.ac: Require libgpg-error 1.13.
+
+2014-04-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: EdDSA support.
+ * scd/app-openpgp.c (KEY_TYPE_EDDSA, CURVE_ED25519): New.
+ (struct app_local_s): Add eddsa.
+ (get_algo_byte, store_fpr): Support KEY_TYPE_EDDSA.
+ (get_ecc_key_parameters, get_curve_name): Support CURVE_ED25519.
+ (send_key_attr, get_public_key): Support KEY_TYPE_EDDSA.
+ (build_ecc_privkey_template): Rename as it supports both of
+ ECDSA and EdDSA.
+ (ecc_writekey): Rename. Support CURVE_ED25519, too.
+ (do_writekey): Follow the change of ecc_writekey.
+ (do_auth): Support KEY_TYPE_EDDSA.
+ (parse_ecc_curve): Support CURVE_ED25519. Bug fix for other curves.
+ (parse_algorithm_attribute): Bug fix for ECDH. Support EdDSA.
+
+2014-04-08 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix compiler warning.
+ * common/mischelp.h (JNLIB_GCC_HAVE_PUSH_PRAGMA): New.
+ * dirmngr/dirmngr.c (handle_tick): Factor time check out to ...
+ (time_for_housekeeping_p): new.
+
+ gpgconf: Add command --launch.
+ * tools/gpgconf.c: Add command --launch.
+ * tools/gpgconf-comp.c (gc_component_launch): New.
+
+ scd: Silent compiler warnings about unused variables.
+ * scd/app-openpgp.c (build_ecdsa_privkey_template): Mark unused arg.
+ (ecdh_writekey): Mark unused args.
+
+2014-04-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Support EdDSA.
+ * agent/pksign.c (agent_pksign_do): Handle EdDSA signature.
+
+ g10: EdDSA support.
+ * g10/keyid.c (keygrip_from_pk): Compute keygrip of EdDSA key.
+ * g10/keygen.c (generate_subkeypair): Ed25519 is for EdDSA.
+ * common/openpgp-oid.c (oid_ed25519): Update.
+
+2014-04-04 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: EdDSA support for SSH.
+ * agent/command-ssh.c (ssh_signature_encoder_eddsa): Signature is
+ two 32-byte opaque data which should not be interpreted as number.
+
+2014-03-27 Werner Koch <wk at gnupg.org>
+
+ gpg: Add commands --quick-sign-key and --quick-lsign-key.
+ * g10/gpg.c (main): Add commands --quick-sign-key and
+ --quick-lsign-key.
+ * g10/keyedit.c (sign_uids): Add args FP and QUICK.
+ (keyedit_quick_sign): New.
+ (show_key_with_all_names): Add arg NOWARN.
+
+ Change some keyedit functions to allow printing to arbitrary streams.
+ * common/ttyio.c (tty_print_string): Add optional arg FP. Change all
+ callers.
+ (tty_print_utf8_string2): Ditto.
+ * g10/keyedit.c (show_prefs): Ditto.
+ (show_key_with_all_names_colon): Ditto.
+ (show_names): Ditto.
+ * g10/keylist.c (print_revokers): Ditto.
+ (print_fingerprint): Ditto.
+
+2014-03-23 Werner Koch <wk at gnupg.org>
+
+ agent: Replace es_mopen by es_fopenmem for ssh.
+ * agent/command-ssh.c (ssh_read_key_public_from_blob): Use
+ es_fopenmem.
+ (ssh_handler_request_identities): Ditto.
+ (ssh_request_process): Ditto.
+
+2014-03-22 Werner Koch <wk at gnupg.org>
+
+ agent: Put ssh key type as comment into sshcontrol.
+ * agent/command-ssh.c (ssh_key_type_spec): Add field name.
+ (ssh_key_types): Add human readable names.
+ (add_control_entry): Add arg SPEC and print key type as comment.
+ (ssh_identity_register): Add arg SPEC.
+ (ssh_handler_add_identity): Add var SPEC and pass ssh_receive_key.
+
+ agent: Support the Ed25519 signature algorithm for ssh.
+ * agent/command-ssh.c (SPEC_FLAG_IS_EdDSA): New.
+ (ssh_key_types): Add entry for ssh-ed25519.
+ (ssh_identifier_from_curve_name): Move to the top.
+ (stream_read_skip): New.
+ (stream_read_blob): New.
+ (ssh_signature_encoder_rsa): Replace MPIS array by an s-exp and move
+ the s-exp parsing to here.
+ (ssh_signature_encoder_dsa): Ditto.
+ (ssh_signature_encoder_ecdsa): Ditto.
+ (ssh_signature_encoder_eddsa): New.
+ (sexp_key_construct): Rewrite.
+ (ssh_key_extract): Rename to ...
+ (ssh_key_to_blob): .. this and rewrite most of it.
+ (ssh_receive_key): Add case for EdDSA.
+ (ssh_convert_key_to_blob, key_secret_to_public): Remove.
+ (ssh_send_key_public): Rewrite.
+ (ssh_handler_request_identities): Simplify.
+ (data_sign): Add rename args. Add new args HASH and HASHLEN. Make
+ use of es_fopenmen and es_fclose_snatch. Remove parsing into MPIs
+ which is now doe in the sgnature encoder functions.
+ (ssh_handler_sign_request): Take care of Ed25519.
+ (ssh_key_extract_comment): Rewrite using gcry_sexp_nth_string.
+
+ agent: Cleanups to prepare implementation of Ed25519.
+ * agent/cvt-openpgp.c: Remove.
+ (convert_to_openpgp): Use gcry_sexp_extract_param.
+ * agent/findkey.c (is_eddsa): New.
+ (agent_is_dsa_key, agent_is_eddsa_key): Check whether ecc means EdDSA.
+ * agent/pksign.c (agent_pksign_do): Add args OVERRIDEDATA and
+ OVERRIDEDATALEN.
+
+ * common/ssh-utils.c (is_eddsa): New.
+ (get_fingerprint): Take care or EdDSA.
+
+2014-03-18 Werner Koch <wk at gnupg.org>
+
+ tools: Fix NULL deref in gpg-connect-agent.
+ * tools/gpg-connect-agent.c (handle_inquire): Do not pass NULL to
+ strlen.
+
+ dirmngr: Resurrect hosts in the HKP hosttable.
+ * dirmngr/dirmngr.c (HOUSEKEEPING_INTERVAL): New.
+ (housekeeping_thread): New.
+ (handle_tick): Call new function.
+ * dirmngr/ks-engine-hkp.c (RESURRECT_INTERVAL): New.
+ (struct hostinfo_s): Add field died_at and set it along with the dead
+ flag.
+ (ks_hkp_print_hosttable): Print that info.
+ (ks_hkp_housekeeping): New.
+
+ common: New function elapsed_time_string.
+ * common/gettime.c (elapsed_time_string): New.
+
+2014-03-17 Werner Koch <wk at gnupg.org>
+
+ gpg: Reject signatures made with MD5.
+ * g10/gpg.c: Add option --allow-weak-digest-algos.
+ (main): Set option also in PGP2 mode.
+ * g10/options.h (struct opt): Add flags.allow_weak_digest_algos.
+ * g10/sig-check.c (do_check): Reject MD5 signatures.
+ * tests/openpgp/defs.inc: Add allow_weak_digest_algos to gpg.conf.
+
+ gpg: Make --auto-key-locate work again with keyservers.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_get): Allow exact search mode.
+ * g10/keyserver.c (keyserver_import_name): Implement.
+ (keyserver_get): Use exact mode for name based import.
+ (keyserver_get): Add args R_FPR and R_FPRLEN. Change all callers.
+
+ gpg: New mechanism "clear" for --auto-key-locate.
+ * g10/getkey.c (parse_auto_key_locate): Implement "clear".
+
+2014-03-14 Werner Koch <wk at gnupg.org>
+
+ gpg-connect-agent: Make it easier to connect to the dirmngr.
+ * tools/gpg-connect-agent.c: Add options --dirmngr and
+ --dirmngr-program.
+
+ dirmngr: Make use of IPv4 and IPV6 more explicit.
+ * common/http.c (connect_server): Handle the new flags.
+ * common/http.h (HTTP_FLAG_IGNORE_IPv4, HTTP_FLAG_IGNORE_IPv4): New.
+ * dirmngr/ks-engine-hkp.c (map_host): Add arg r_httpflags.
+ (make_host_part): Ditto.
+ (send_request): Add arg httpflags.
+ (ks_hkp_search, ks_hkp_get, ks_hkp_put): Handle httpflags.
+
+ dirmngr: Do not use brackets around legacy IP addresses.
+ * dirmngr/ks-engine-hkp.c (my_getnameinfo): Change args to take a
+ complete addrinfo. Bracket only v6 addresses. Change caller.
+
+ gpg: Print the actual used keyserver address.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_search, ks_hkp_get): Print SOURCE
+ status lines.
+ * g10/call-dirmngr.c (ks_status_parm_s): New.
+ (ks_search_parm_s): Add field stparm.
+ (ks_status_cb): New.
+ (ks_search_data_cb): Send source to the data callback.
+ (gpg_dirmngr_ks_search): Change callback prototope to include the
+ SPECIAL arg. Adjust all users. Use ks_status_cb.
+ (gpg_dirmngr_ks_get): Add arg r_source and use ks_status_cb.
+ * g10/keyserver.c (search_line_handler): Adjust callback and print
+ "data source" disgnostic.
+ (keyserver_get): Print data source diagnostic.
+
+ dirmngr: Default to a user socket name and enable autostart.
+ * common/homedir.c (dirmngr_socket_name): Rename to
+ dirmngr_sys_socket_name.
+ (dirmngr_user_socket_name): New.
+ * common/asshelp.c (start_new_dirmngr): Handle sys and user dirmngr
+ socket.
+ * dirmngr/dirmngr.c (main): Ditto.
+ * dirmngr/server.c (cmd_getinfo): Ditto.
+ * sm/server.c (gpgsm_server): Ditto.
+ * dirmngr/dirmngr-client.c (start_dirmngr): Likewise.
+ * tools/gpgconf.c (main): Print "dirmngr-sys-socket" with --list-dirs.
+
+ * configure.ac (USE_DIRMNGR_AUTO_START): Set by default.
+
+2014-03-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Add option --dirmngr-program.
+ * g10/gpg.c: Add option --dirmngr-program.
+ * g10/options.h (struct opt): Add field dirmngr_program.
+ * g10/call-dirmngr.c (create_context): Use new var.
+
+ * dirmngr/dirmngr.c: Include gc-opt-flags.h.
+ (main): Remove GC_OPT_FLAG_*.
+ * tools/gpgconf-comp.c (GC_OPT_FLAG_NO_CHANGE): Move macro to ...
+ * common/gc-opt-flags.h: here.
+
+ dirmngr: Detect dead keyservers and try another one.
+ * dirmngr/ks-action.c (ks_action_resolve): Rename var for clarity.
+ (ks_action_search, ks_action_put): Ditto.
+ (ks_action_get): Consult only the first server which retruned some
+ data.
+
+ * dirmngr/ks-engine-hkp.c (SEND_REQUEST_RETRIES): New.
+ (map_host): Add arg CTRL and call dirmngr_tick.
+ (make_host_part): Add arg CTRL.
+ (mark_host_dead): Allow the use of an URL.
+ (handle_send_request_error): New.
+ (ks_hkp_search, ks_hkp_get, ks_hkp_put): Mark host dead and retry on
+ error.
+
+ http: Add a flag to the URL parser indicating a literal v6 address.
+ * common/http.h (struct parsed_uri_t): Add field v6lit.
+ * common/http.c (do_parse_uri): Set v6lit.
+
+2014-03-12 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: writekey support of ECC.
+ * scd/app-openpgp.c (CURVE_SEC_P256K1, get_algo_byte): New.
+ (store_fpr): Support ECC keys with varargs.
+ (get_ecc_key_parameters, get_curve_name): Support secp256k1.
+ (parse_ecc_curve): Likewise.
+ (build_ecdsa_privkey_template, rsa_writekey, ecdsa_writekey): New.
+ (ecdh_writekey): New. Not implemented yet.
+ (do_writekey): Call rsa_writekey, ecdsa_writekey, or ecdh_writekey.
+ (do_genkey): Follow the change of store_fpr.
+
+2014-03-11 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Put brackets around IP addresses in the hosttable.
+ * dirmngr/ks-engine-hkp.c (EAI_OVERFLOW): Provide a substitute.
+ (my_getnameinfo): New.
+ (map_host): Use it.
+
+ dirmngr: Add command option to mark hosts as dead or alive.
+ * dirmngr/server.c (cmd_killdirmngr): Factor some code out to ...
+ (check_owner_permission): here.
+ (cmd_keyserver): Add options --dead and --alive.
+ * dirmngr/ks-engine-hkp.c (host_in_pool_p): New.
+ (ks_hkp_mark_host): New.
+
+ dirmngr: Make Assuan output of keyblocks easier readable.
+ * dirmngr/server.c (data_line_cookie_write): Print shorter data lines
+ in verbose mode.
+
+ dirmngr: Fix HKP host selection code.
+ * dirmngr/server.c (cmd_keyserver): Add option --resolve and change
+ --print-hosttable to --hosttable.
+ * dirmngr/ks-action.c (ks_printf_help): New.
+ (ks_action_resolve): New.
+ * dirmngr/ks-engine-hkp.c (select_random_host): Fix selection.
+ (ks_hkp_print_hosttable): Print to assuan stream.
+ (map_host): Remove debug code. Add arg FORCE_SELECT. Return numeric
+ IP addr if it can't be resolved.
+ (make_host_part): Add arg FORCE_SELECT; change callers to pass false.
+ (ks_hkp_resolve): New.
+
+ List readline support in configure summary.
+ * m4/readline.m4: Set gnupg_cv_have_readline.
+ * configure.ac: Add readline support to summary output.
+
+2014-03-11 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: API change of agent_key_from_file.
+ * agent/findkey.c (agent_key_from_file): Always return S-expression.
+ * agent/command.c (cmd_passwd): Distinguish by SHADOW_INFO.
+ (cmd_export_key): Likewise. Free SHADOW_INFO.
+ (cmd_keytocard): Likewise. Release S_SKEY.
+ * agent/pkdecrypt.c (agent_pkdecrypt): Likewise.
+ * agent/pksign.c (agent_pksign_do): Likewise. Use the S-expression to
+ know the key type.
+
+2014-03-10 Werner Koch <wk at gnupg.org>
+
+ Backport useful code from fixes for bug 1447.
+ * configure.ac: Cehck for inet_ntop.
+ * m4/libcurl.m4: Provide a #define for the version of the curl
+ library.
+
+ scd: acquire lock in new_reader_slot.
+ * scd/apdu.c (new_reader_slot): Acquire lock.
+ (open_ct_reader, open_pcsc_reader_direct, open_pcsc_reader_wrapped)
+ (open_ccid_reader, open_rapdu_reader): Release lock.
+ (lock_slot, trylock_slot, unlock_slot): Move more to the top.
+
+ Do not require libiconv for Android.
+ * configure.ac (require_iconv): New. Set to false for android.
+ (AM_ICONV): Run only if required.
+
+2014-03-07 Werner Koch <wk at gnupg.org>
+
+ dirmmgr: Use a portability wrapper for struct timeval.
+ * dirmngr/dirmngr_ldap.c [W32]: Include winber.h.
+ (my_ldap_timeval_t): New.
+
+ Silence more warnings about unused vars and args.
+ * dirmngr/cdblib.c (cdb_init) [W32]: Remove unused var.
+ * dirmngr/dirmngr-client.c (start_dirmngr): s/int/assuan_fd_t/.
+ * dirmngr/dirmngr.c (w32_service_control): Mark unused args.
+ (call_real_main): New.
+ (main) [W32]: Use new function to match prototype.
+ (real_main) [W32]: Mark unused vars.
+ (handle_signal) [W32]: Do not build the function at all.
+ (handle_connections) [W32]: Do not define signo.
+ * dirmngr/ldap-wrapper-ce.c (outstream_reader_cb): Remove used vars.
+ * g10/tdbio.c (ftruncate) [DOSISH]: Define only if not yet defined.
+
+ dirmngr: Simplify strtok macro.
+ * dirmngr/ldap-url.c (ldap_utf8_strtok): Remove unused r3d arg.
+ (ldap_str2charray): Remove lasts.
+
+ Use attribute __gnu_printf__ also in estream header files.
+ * common/estream-printf.h: Use attribute gnu_printf.
+ * common/estream.h: Ditto.
+
+ Use attribute __gnu_printf__ with our estream-printf functions.
+ * common/mischelp.h (JNLIB_GCC_A_PRINTF): Use __gnu_printf__
+ (JNLIB_GCC_A_NR_PRINTF): Ditto.
+
+ w32: Silence warnings about unused vars.
+ * agent/gpg-agent.c (main) [W32]: Mark unused vars.
+ * sm/gpgsm.c (run_protect_tool) [W32]: Ditto.
+ * g10/trustdb.c (check_regexp) [DISABLE_REGEX]: Ditto.
+ * scd/scdaemon.c (main) [W32]: Ditto.
+ (handle_connections) [W32]: Ditto.
+ (handle_signal) [W32]: Do not build the function at all.
+ * scd/apdu.c (pcsc_send_apdu_direct): Ditto.
+ (connect_pcsc_card): s/long/pcsc_dword_t/.
+ (open_pcsc_reader_direct): Remove var listlen.
+
+ w32: Fix a potential problem in gpgconf's gettext.
+ * tools/gpgconf-comp.c (my_dgettext) [USE_SIMPLE_GETTEXT]: Make sure
+ to return something even DOMAIN is not given.
+
+ Silence several warnings when building under Windows.
+ * agent/call-scd.c (start_scd): Replace int by assuan_fd_t.
+ (start_pinentry): Ditto.
+ * common/asshelp.c (start_new_gpg_agent): Replace int by assuan_fd_t.
+ * common/dotlock.c (GNUPG_MAJOR_VERSION): Include stringhelp.h for
+ prototypes on Windows and some other platforms.
+ * common/logging.c (fun_writer): Declare addrbuf only if needed.
+ * g10/decrypt.c (decrypt_message_fd) [W32]: Return not_implemented.
+ * g10/encrypt.c (encrypt_crypt) [W32]: Return error if used in server
+ mode.
+ * g10/dearmor.c (dearmor_file, enarmor_file): Replace GNUPG_INVALID_FD
+ by -1 as temporary hack for Windows.
+ * g10/export.c (do_export): Ditto.
+ * g10/revoke.c (gen_desig_revoke, gen_revoke): Ditto.
+ * g10/sign.c (sign_file, clearsign_file, sign_symencrypt_file): Ditto.
+ * g10/server.c (cmd_verify, gpg_server) [W32]: Return an error.
+
+ w32: Include winsock2.h to silence warnings.
+
+ gl: Avoid warning about shadowing an arg.
+ * gl/setenv.c (KNOWN_VALUE): s/value/_v/.
+
+ common: Fix build problem with Sun Studio compiler.
+ * common/estream.c (ESTREAM_MUTEX_UNLOCK): Use int dummy dummy
+ functions.
+ (ESTREAM_MUTEX_INITIALIZE): Ditto.
+
+ gpg: Do not require a trustdb with --always-trust.
+ * g10/tdbio.c (tdbio_set_dbname): Add arg R_NOFILE.
+ * g10/trustdb.c (trustdb_args): Add field no_trustdb.
+ (init_trustdb): Set that field.
+ (revalidation_mark): Take care of a nonexistent trustdb file.
+ (read_trust_options): Ditto.
+ (tdb_get_ownertrust): Ditto.
+ (tdb_get_min_ownertrust): Ditto.
+ (tdb_update_ownertrust): Ditto.
+ (update_min_ownertrust): Ditto.
+ (tdb_clear_ownertrusts): Ditto.
+ (tdb_cache_disabled_value): Ditto.
+ (tdb_check_trustdb_stale): Ditto.
+ (tdb_get_validity_core): Ditto.
+ * g10/gpg.c (main): Do not create a trustdb with most commands for
+ trust-model always.
+
+ gpg: Print a "not found" message for an unknown key in --key-edit.
+ * g10/keyedit.c (keyedit_menu): Print message.
+
+ gpg: Protect against rogue keyservers sending secret keys.
+ * g10/options.h (IMPORT_NO_SECKEY): New.
+ * g10/keyserver.c (keyserver_spawn, keyserver_import_cert): Set new
+ flag.
+ * g10/import.c (import_secret_one): Deny import if flag is set.
+
+ agent: Fix UPDATESTARTUPTTY for ssh.
+ * agent/command-ssh.c (setup_ssh_env): Fix env setting.
+
+ gpgv: Init Libgcrypt to avoid syslog warning.
+ * g10/gpgv.c (main): Check libgcrypt version and disable secure
+ memory.
+
+ Improve libcurl detection.
+ * m4/libcurl.m4: Do not use AC_PATH_PROG if --with-libcurl as been
+ given. Suggested by John Marshall.
+
+ gpg: Remove legacy keyserver examples from the template conf file.
+ * g10/options.skel: Update.
+
+ (cherry picked from commit f3c5cc8bcd37e38b5d65db6a50466e22d03d1f0c)
+
+ w32: Define WINVER only if needed.
+ * common/sysutils.c (WINVER): Define only if less that 5.0.
+
+ w32: Remove unused code.
+ * jnlib/w32-reg.c (write_w32_registry_string): Remove.
+
+ agent: Make --allow-mark-trusted the default.
+ * agent/gpg-agent.c (opts, main): Add option --no-allow-mark-trusted.
+ Put this option into the gpgconf-list.
+ (main): Enable opt.allow_mark_trusted by default.
+ * tools/gpgconf-comp.c (gc_options_gpg_agent): Replace
+ allow-mark-trusted by no-allow-mark-trusted.
+
+ * agent/trustlist.c (agent_marktrusted): Always set the "relax" flag.
+
+ ssh: Add support for Putty.
+ * agent/gpg-agent.c [W32]: Include Several Windows header.
+ (opts): Change help text for enable-ssh-support.
+ (opts, main): Add option --enable-putty-support
+ (putty_support, PUTTY_IPC_MAGIC, PUTTY_IPC_MAXLEN): New for W32.
+ (agent_init_default_ctrl): Add and asssert call.
+ (putty_message_proc, putty_message_thread): New.
+ (handle_connections) [W32]: Start putty message thread.
+ * common/sysutils.c (w32_get_user_sid): New for W32 only
+ * tools/gpgconf-comp.c (gc_options_gpg_agent): Add
+ --enable-ssh-support and --enable-putty-support. Make the
+ configuration group visible at basic level.
+ * agent/command-ssh.c (serve_mmapped_ssh_request): New for W32 only.
+
+ agent: Fix binary vs. text mode problem in ssh.
+ * agent/command-ssh.c (file_to_buffer)
+ (ssh_handler_request_identities): Open streams in binary mode.
+ (start_command_handler_ssh): Factor some code out to ..
+ (setup_ssh_env): new function.
+
+ Fix syntax error for building on APPLE.
+ * scd/pcsc-wrapper.c [__APPLE__]: Fix syntax error.
+
+ Ignore obsolete option --disable-keypad.
+ * scd/scdaemon.c (opts): Ignore --disable-keypad.
+
+ Allow marking options as ignored.
+ * jnlib/argparse.h (ARGPARSE_OPT_IGNORE): New.
+ (ARGPARSE_TYPE_MASK): New, for internal use.
+ (ARGPARSE_ignore): New.
+ * jnlib/argparse.c (optfile_parse, arg_parse): Replace remaining
+ constants by macros.
+ (optfile_parse): Implement ARGPARSE_OPT_IGNORE.
+ (arg_parse): Exclide ignore options from --dump-options.
+
+2014-03-06 Werner Koch <wk at gnupg.org>
+
+ common: Fix recent commit 55656208.
+ * common/membuf.c (get_membuf_shrink): Fix use of LEN.
+
+2014-03-06 NIIBE Yutaka <gniibe at fsij.org>
+
+ Fix g10/trust.c.
+ * g10/trust.c (register_trusted_keyid, register_trusted_key)
+ (update_ownertrust): Call functions with tdb_.
+
+2014-02-26 Werner Koch <wk at gnupg.org>
+
+ common: Replace all macros in strusage() returned strings.
+ * common/argparse.c (writechar): Remove.
+ (writestrings): Simplify.
+ (strusage): Use map_static_macro_string.
+
+ common: New function map_static_macro_string.
+ * common/mapstrings.c: New.
+ * common/t-mapstrings.c: New.
+ * common/t-support.h (DIM, DIMof): Define if not defined.
+ * common/Makefile.am: Add new files.
+
+ common: New function get_membuf_shrink.
+ * common/membuf.c (get_membuf_shrink): New.
+
+ agent: Fixed unresolved symbol under Windows.
+ * agent/gpg-agent.c (main): s/ttyname/gnupg_ttyname/.
+
+ common: Require an installed libiconv.
+ * common/utf8conv.c: Remove dynload.h.
+ (load_libiconv): Remove. Remove all calls to it.
+
+2014-02-10 Werner Koch <wk at gnupg.org>
+
+ gpg: Silent more compiler warnings due to some configure options.
+ * g10/keygen.c (generate_keypair, gen_card_key)
+ (gen_card_key_with_backup) [!ENABLE_CARD_SUPPORT]: Mark unused args.
+
+ tests: Avoid segv if dns cert lookup is not configured.
+ * common/dns-cert.c (get_dns_cert) [!USE_DNS_CERT]: Reset return args.
+
+ gpg: Cleanup compiler warnings due to some configure options.
+ * g10/photoid.c (show_photos) [DISABLE_PHOTO_VIEWER]: Mark args as
+ unused.
+ * tools/gpgconf-comp.c (my_dgettext): Mark DOMAIN as unused if NLS is
+ not configured.
+
+ gpg: Allow building without any trust model support.
+ * configure.ac: Add option --disable-trust-models
+ (NO_TRUST_MODELS): New ac_define and am_conditional.
+ * g10/Makefile.am (trust_source): New.
+ (gpg2_SOURCES): Factor some files out to above. Add trust.c.
+ * g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
+ --import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
+ --list-trustdb, --trustdb-name, --auto-check-trustdb,
+ --no-auto-check-trustdb, and --force-ownertrust.
+ (parse_trust_model) [NO_TRUST_MODELS]: Do not build.
+ (main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
+ trustdb related option code.
+ * g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
+ "enable", and "disable".
+ * g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
+ "tru" record.
+
+ * g10/trust.c: New.
+ * g10/trustdb.c (struct key_item): Move to trustdb.h.
+ (register_trusted_keyid): Rename to tdb_register_trusted_keyid.
+ (register_trusted_key): Rename to tdb_register_trusted_key.
+ (trust_letter, uid_trust_string_fixed, trust_value_to_string)
+ (string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
+ (get_ownertrust_string, get_validity_info, get_validity_string)
+ (clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
+ (mark_usable_uid_certs): Move to trust.c and make global.
+ (is_in_klist): Move as inline to trustdb.h.
+ (trustdb_check_or_update): Rename to tdb_check_or_update
+ (revalidation_mark): Rename to tdb_revalidation_mark.
+ (get_ownertrust): Rename to tdb_get_ownertrust.
+ (get_min_ownertrust): Rename to tdb_get_min_ownertrust.
+ (update_ownertrust): Rename to tdb_update_ownertrust.
+ (clear_ownertrusts): Rename to tdb_clear_ownertrusts.
+ (cache_disabled_value): Rename to tdb_cache_disabled_value.
+ (check_trustdb_stale): Rename to tdb_check_trustdb_stale.
+ (get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
+ factor some code out to ...
+ * trust.c (get_validity): ...new.
+ (check_or_update_trustdb): New wrapper.
+ (revalidation_mark): New wrapper.
+ (get_ownertrust): New wrapper.
+ (get_ownertrust_with_min): New wrapper.
+ (update_ownertrust): New wrapper.
+ (clear_ownertrusts): New wrapper.
+ (cache_disabled_value): New wrapper.
+ (check_trustdb_stale): New wrapper.
+
+ * tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
+ of --always-trust.
+
+ tests: Handle disabled algorithms.
+ * tests/openpgp/mds.test: Skip disabled algorithms.
+ * tests/openpgp/signencrypt-dsa.test: Ditto.
+ * tests/openpgp/sigs-dsa.test: Ditto.
+
+2014-02-07 Werner Koch <wk at gnupg.org>
+
+ Silence annoying ABI change warning.
+ * configure.ac [GCC]: Pass -Wno-psabi for gcc >= 4.6. Avoid some gcc
+ option tests for gcc >= 4.6
+
+ Allow disabling of card support.
+ * configure.ac: Add option --disable-card-support. Also add
+ am_conditional and do not build scd if card support is enabled.
+
+ gpg: List only available algos in --gen-key.
+ * g10/keygen.c (ask_algo, ask_curve): Take care of GPG_USE_<algo>.
+
+ gpg: Change --print-mds to output enabled OpenPGP algos.
+ * g10/gpg.c (print_mds): Use opengpg_md_test_algo. Test also for MD5
+ availibility.
+
+ gpg: Avoid compiler warnings for disabled algos.
+ * g10/misc.c (map_cipher_openpgp_to_gcry): Add case for disabled algo.
+ (openpgp_pk_test_algo2): Ditto.
+ (map_md_openpgp_to_gcry): Ditto.
+
+2014-02-05 Werner Koch <wk at gnupg.org>
+
+ gpg: Change format for the key size in --list-key and --edit-key.
+ * g10/gpg.c (oLegacyListMode, opts, main): Add --legacy-list-mode.
+ * g10/options.h (struct opt): Add field legacy_list_mode.
+ * g10/keydb.h (PUBKEY_STRING_SIZE): New.
+ * g10/keyid.c (pubkey_string): New.
+ * g10/import.c (import_one, import_secret_one): Use pubkey_string.
+ * g10/keylist.c (print_seckey_info): Ditto.
+ (print_pubkey_info, print_card_key_info): Ditto.
+ (list_keyblock_print): Ditto.
+ * g10/mainproc.c (list_node): Ditto.
+ * g10/pkclist.c (do_edit_ownertrust, build_pk_list): Ditto.
+ * g10/keyedit.c (show_key_with_all_names): Ditto. Also change the
+ format.
+ (show_basic_key_info): Ditto.
+ * common/openpgp-oid.c (openpgp_curve_to_oid): Also allow "ed25519".
+ (openpgp_oid_to_curve): Downcase "ed25519"
+
+2014-01-31 Werner Koch <wk at gnupg.org>
+
+ gpg: Add configure options to disable algorithms.
+ * acinclude.m4 (GNUPG_GPG_DISABLE_ALGO): New.
+ * configure.ac: Add --enable-gpg-* options to disable non MUS
+ algorithms.
+ * g10/misc.c (map_cipher_openpgp_to_gcry): Implement these options.
+ (openpgp_pk_test_algo2): Ditto.
+ (map_md_openpgp_to_gcry): Ditto.
+ (openpgp_cipher_test_algo, openpgp_md_test_algo): Simplify.
+
+ gpg: Improve --version algo info output.
+ * g10/misc.c (openpgp_pk_algo_name): Return a different string for
+ each ECC algorithm.
+ * g10/gpg.c (build_list_pk_test_algo): New wrapper to cope with the
+ different algo type enums.
+ (build_list_pk_algo_name): Ditto.
+ (build_list_cipher_test_algo): Ditto.
+ (build_list_cipher_algo_name): Ditto.
+ (build_list_md_test_algo): Ditto.
+ (build_list_md_algo_name): Ditto.
+ (my_strusage): Use them.
+ (list_config): Ditto. Add "pubkeyname".
+ (build_list): Add letter==1 hack.
+
+ gpg: Start using OpenPGP digest algo ids.
+ * g10/misc.c (print_pubkey_algo_note): Use enum typedef for the arg.
+ (print_cipher_algo_note): Ditto.
+ (print_digest_algo_note): Ditto.
+ (map_md_openpgp_to_gcry): New.
+ (openpgp_md_test_algo): Rewrite.
+ (openpgp_md_algo_name): Rewrite to do without Libgcrypt.
+ * g10/cpr.c (write_status_begin_signing): Remove hardwired list of
+ algo ranges.
+
+ gpg: Use only OpenPGP cipher algo ids.
+ * g10/misc.c (map_cipher_openpgp_to_gcry): Use explicit mapping and
+ use enums for the arg and return value.
+ (map_cipher_gcry_to_openpgp): Ditto.
+ (openpgp_cipher_blocklen): Use constant macros.
+ (openpgp_cipher_test_algo): Use mapping function and prepare to
+ disable algorithms.
+ (openpgp_cipher_algo_name): Do not use Libgcrypt.
+
+ * g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Replace
+ CGRY_CIPHER_* by CIPHER_ALGO_*.
+
+ * common/openpgpdefs.h (cipher_algo_t): Remove unused
+ CIPHER_ALGO_DUMMY.
+
+2014-01-30 Werner Koch <wk at gnupg.org>
+
+ gpg: Use only OpenPGP public key algo ids and add the EdDSA algo id.
+ * common/sexputil.c (get_pk_algo_from_canon_sexp): Change to return a
+ string.
+ * g10/keygen.c (check_keygrip): Adjust for change.
+ * sm/certreqgen-ui.c (check_keygrip): Likewise.
+
+ * agent/pksign.c (do_encode_dsa): Remove bogus map_pk_openpgp_to_gcry.
+
+ * g10/misc.c (map_pk_openpgp_to_gcry): Remove.
+ (openpgp_pk_test_algo): Change to a wrapper for openpgp_pk_test_algo2.
+ (openpgp_pk_test_algo2): Rewrite.
+ (openpgp_pk_algo_usage, pubkey_nbits): Add support for EdDSA.
+ (openpgp_pk_algo_name): Rewrite to remove need for gcry calls.
+ (pubkey_get_npkey, pubkey_get_nskey): Ditto.
+ (pubkey_get_nsig, pubkey_get_nenc): Ditto.
+ * g10/keygen.c(do_create_from_keygrip): Support EdDSA.
+ (common_gen, gen_ecc, ask_keysize, generate_keypair): Ditto.
+ * g10/build-packet.c (do_key): Ditto.
+ * g10/export.c (transfer_format_to_openpgp): Ditto.
+ * g10/getkey.c (cache_public_key): Ditto.
+ * g10/import.c (transfer_secret_keys): Ditto.
+ * g10/keylist.c (list_keyblock_print, list_keyblock_colon): Ditto.
+ * g10/mainproc.c (proc_pubkey_enc): Ditto.
+ * g10/parse-packet.c (parse_key): Ditto,
+ * g10/sign.c (hash_for, sign_file, make_keysig_packet): Ditto.
+ * g10/keyserver.c (print_keyrec): Use openpgp_pk_algo_name.
+ * g10/pkglue.c (pk_verify, pk_encrypt, pk_check_secret_key): Use only
+ OpenPGP algo ids and support EdDSA.
+ * g10/pubkey-enc.c (get_it): Use only OpenPGP algo ids.
+ * g10/seskey.c (encode_md_value): Ditto.
+
+2014-01-29 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove cipher.h and put algo ids into a common file.
+ * common/openpgpdefs.h (cipher_algo_t, pubkey_algo_t, digest_algo_t)
+ (compress_algo_t): New.
+ * agent/gpg-agent.c: Remove ../g10/cipher.h. Add openpgpdefs.h.
+ * g10/cipher.h (DEK): Move to ...
+ * g10/dek.h: new file.
+ * g10/cipher.h (is_RSA, is_ELGAMAL, is_DSA)
+ (PUBKEY_MAX_NPKEY, PUBKEY_MAX_NSKEY, PUBKEY_MAX_NSIG, PUBKEY_MAX_NENC)
+ (PUBKEY_USAGE_SIG, PUBKEY_USAGE_ENC, PUBKEY_USAGE_CERT)
+ (PUBKEY_USAGE_AUTH, PUBKEY_USAGE_NONE): Move to
+ * g10/packet.h: here.
+ * g10/cipher.h: Remove. Remove from all files.
+ * g10/filter.h, g10/packet.h: Include dek.h.
+ * g10/Makefile.am (common_source): Remove cipher.h. Add dek.h.
+
+ include: Remove this directory.
+ * include/cipher.h: Move to ...
+ * g10/cipher.h: here.
+ * agent/gpg-agent.c: Adjust header file name.
+
+ * include/host2net.h: Move to ...
+ * common/host2net.h: here. Change license to LGPLv3/GPLv2. Adjust
+ notices to reflect that only me worked on that file.
+
+ * include/types.h: Remove.
+ * common/types.h: Include inttypes.h. Add byte typedef and comments
+ for __riscos__.
+ * common/iobuf.h: Adjust header file name.
+
+ * include/_regex.h: Remove this unused file.
+
+ * include/Makefile.am: Remove.
+ * Makefile.am (SUBDIRS): Remove "include".
+ * configure.ac (AC_CONFIG_FILES): Remove include/Makefile.
+ * include/ChangeLog-2011: Move to ...
+ * common/ChangeLog-2011.include: here.
+ * common/Makefile.am (EXTRA_DIST): Add file.
+
+ * include/zlib-riscos.h: Move this repo only file to ...
+ * g10/zlib-riscos.h: here.
+
+ * include/: Remove.
+
+2014-01-17 Werner Koch <wk at gnupg.org>
+
+ Remove unused u64 type definitions.
+ * configure.ac: Remove check for uint64 and UINT64_C.
+ * include/types.h: Remove u64 stuff.
+ * common/types.h: Ditto.
+
+2014-01-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Not remove SSH socket when already running.
+ * agent/gpg-agent.c (main): Defer setting of socket_name_ssh to avoid
+ removal of the socket when it will die in create_server_socket for
+ socket_name.
+
+ agent: Fix agent_is_eddsa_key.
+ * agent/findkey.c (agent_is_eddsa_key): Implemented.
+
+2014-01-15 NIIBE Yutaka <gniibe at fsij.org>
+
+ Add secp256k1.
+ * common/openpgp-oid.c (openpgp_curve_to_oid): Add secp256k1.
+ (openpgp_oid_to_curve): Likewise.
+
+ * g10/keygen.c (ask_curve): Add secp256k1.
+
+2014-01-10 Werner Koch <wk at gnupg.org>
+
+ autogen.sh: Add rule for 64 bit windows.
+
+ Turn autogen.sh into a generic script.
+ * autogen.sh: Revamp.
+ * autogen.rc: New.
+ * Makefile.am (EXTRA_DIST): Add autogen.rc.
+
+ Rename scripts/ to build-aux/
+ * scripts/: Rename to build-aux/
+ * Makefile.am: Adjust accordingly.
+ * configure.ac (AC_CONFIG_AUX_DIR): Change to build-aux.
+
+2014-01-09 Werner Koch <wk at gnupg.org>
+
+ Improve the speedo make script.
+ * scripts/gpg-w32-dev/README: Remove
+ * scripts/gpg-w32-dev/GNUmakefile, scripts/gpg-w32-dev/speedo.mk:
+ Merge into ..
+ * scripts/speedo.mk: this.
+
+ gpgsplit: Allow building without zlib support.
+ * tools/gpgsplit.c [!HAVE_ZLIB]: Do not include zlib.h.
+ (handle_zlib): Build only if HAVE_ZLIB is defined.
+ (write_part): Support zlib and zip only if HAVE_ZLIB is defined.
+
+ w32: Fix backslash quoting in registry name.
+ * configure.ac (GNUPG_REGISTRY_DIR): Double backslashes.
+
+ Fix test for zlib.
+ * configure.ac (HAVE_ZLIB): Define only if found.
+
+ Add --enable-silent-rules stuff.
+ * configure.ac: Add AM_SILENT_RULES.
+
+2014-01-08 Werner Koch <wk at gnupg.org>
+
+ w32: Add macro for the registry key.
+ * configure.ac (GNUPG_REGISTRY_DIR) [W32]: New ac-define.
+ * common/homedir.c (default_homedir): Use it.
+ * common/logging.c (do_logv): Use it.
+
+2013-12-11 Werner Koch <wk at gnupg.org>
+
+ gpg: Change --show-session-key to print the session key earlier.
+ * g10/cpr.c (write_status_strings): New.
+ (write_status_text): Replace code by a call to write_status_strings.
+ * g10/mainproc.c (proc_encrypted): Remove show_session_key code.
+ * g10/decrypt-data.c (decrypt_data): Add new show_session_key code.
+
+2013-12-05 Werner Koch <wk at gnupg.org>
+
+ gpg: Change OID of Ed25519 and add Brainpool oids.
+ * common/openpgp-oid.c (openpgp_curve_to_oid): Change OID for
+ Ed25519. Add brainpool OIDs.
+ (openpgp_oid_to_curve): Ditto.
+
+2013-11-29 Werner Koch <wk at gnupg.org>
+
+ common: Add put_membuf_printf.
+ * common/membuf.c (put_membuf_printf): New.
+
+2013-11-27 Werner Koch <wk at gnupg.org>
+
+ gpg: Change armor Version header to emit only the major version.
+ * g10/options.h (opt): Rename field no_version to emit_version.
+ * g10/gpg.c (main): Init opt.emit_vesion to 1. Change --emit-version
+ to bump up opt.emit_version.
+ * g10/armor.c (armor_filter): Implement different --emit-version
+ values.
+
+2013-11-18 Werner Koch <wk at gnupg.org>
+
+ Make use of the *_NAME etc macros.
+ Replace hardwired strings at many places with new macros from config.h
+ and use the new strusage macro replacement feature.
+
+ * common/asshelp.c (lock_spawning) [W32]: Change the names of the spawn
+ sentinels.
+ * agent/command.c (cmd_import_key): Use asprintf to create the prompt.
+
+ Add strusage macro replacement feature.
+ * common/argparse.c (writechar): New.
+ (writestrings): Add macro replacement feature.
+ (show_help): Remove specialized @EMAIL@ replacement.
+ * configure.ac (GNUPG_NAME, GPG_NAME, GPGSM_NAME): Define.
+ (GPG_AGENT_NAME, DIRMNGR_NAME, G13_NAME, GPGCONF_NAME): Define.
+ (GPGTAR_NAME, GPG_AGENT_INFO_NAME, GPG_AGENT_SOCK_NAME): Define.
+ (GPG_AGENT_SSH_SOCK_NAME, DIRMNGR_INFO_NAME): Define.
+ (DIRMNGR_SOCK_NAME): Define.
+
+2013-11-15 Werner Koch <wk at gnupg.org>
+
+ kbx: Implement update operation for OpenPGP keyblocks.
+ * kbx/keybox-update.c (keybox_update_keyblock): Implement.
+ * kbx/keybox-search.c (get_blob_flags): Move to ...
+ * kbx/keybox-defs.h (blob_get_type): here.
+ * kbx/keybox-file.c (_keybox_read_blob2): Fix calling without R_BLOB.
+ * g10/keydb.c (build_keyblock_image): Allow calling without
+ R_SIGSTATUS.
+ (keydb_update_keyblock): Implement for keybox.
+
+ * kbx/keybox-dump.c (_keybox_dump_blob): Fix printing of the unhashed
+ size. Print "does not expire" also on 64 bit platforms.
+
+ gpg: Rework ECC support and add experimental support for Ed25519.
+ * agent/findkey.c (key_parms_from_sexp): Add algo name "ecc".
+ (agent_is_dsa_key): Ditto.
+ (agent_is_eddsa_key): New. Not finished, though.
+ * agent/pksign.c (do_encode_eddsa): New.
+ (agent_pksign_do): Use gcry_log_debug functions.
+ * agent/protect.c (agent_protect): Parse a flags parameter.
+ * g10/keygen.c (gpg_curve_to_oid): Move to ...
+ * common/openpgp-oid.c (openpgp_curve_to_oid): here and rename.
+ (oid_ed25519): New.
+ (openpgp_oid_is_ed25519): New.
+ (openpgp_oid_to_curve): New.
+ * common/t-openpgp-oid.c (test_openpgp_oid_is_ed25519): New.
+ * g10/build-packet.c (gpg_mpi_write): Write the length header also for
+ opaque MPIs.
+ (gpg_mpi_write_nohdr): New.
+ (do_key): Use gpg_mpi_write_nohdr depending on algorithm.
+ (do_pubkey_enc): Ditto.
+ * g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Use
+ gpg_mpi_write_nohdr.
+ * g10/export.c (transfer_format_to_openpgp):
+ * g10/keygen.c (ecckey_from_sexp): Return the error.
+ (gen_ecc): Repalce arg NBITS by CURVE.
+ (read_parameter_file): Add keywords "Key-Curve" and "Subkey-Curve".
+ (ask_curve): New.
+ (generate_keypair, generate_subkeypair): Use ask_curve.
+ (do_generate_keypair): Also pass curve name.
+ * g10/keylist.c (list_keyblock_print, list_keyblock_colon): Print
+ curve name.
+ * g10/parse-packet.c (mpi_read): Remove workaround for
+ Libcgrypt < 1.5.
+ (parse_key): Fix ECC case. Print the curve name.
+ * g10/pkglue.c (mpi_from_sexp): Rename to get_mpi_from_sexp.
+ (pk_verify, pk_check_secret_key): Add special case for Ed25519.
+ * g10/seskey.c (encode_md_value): Ditto.
+ * g10/sign.c (do_sign, hash_for, sign_file): Ditto.
+
+ kbx: Fix possible segv in kbxdump.
+ * kbx/keybox-dump.c (_keybox_dump_blob): Check length before get32.
+
+ Require Libgcrypt 1.6.
+ * agent/pksign.c (do_encode_dsa): Remove Libgcrypt version check
+
+2013-11-13 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: more pinpad input fix for PC/SC.
+ * scd/apdu.c (check_pcsc_pinpad): Set default values here.
+ (pcsc_pinpad_verify, pcsc_pinpad_modify): Remove setting default
+ values, as it's too late.
+
+2013-11-11 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: more pinpad fix.
+ * scd/apdu.c (check_pcsc_pinpad): Set ->minlen and ->maxlen only when
+ those are specified.
+ (pcsc_pinpad_modify): Remove old check code.
+
+2013-10-29 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: pinpad fix for PC/SC on Windows.
+ * scd/apdu.c (SCARD_CTL_CODE): Fix for Windows.
+
+2013-10-28 Werner Koch <wk at gnupg.org>
+
+ doc: Change yat2m to allow arbitrary condition names.
+ * doc/yat2m.c (MAX_CONDITION_NESTING): New.
+ (gpgone_defined): Remove.
+ (condition_s, condition_stack, condition_stack_idx): New.
+ (cond_is_active, cond_in_verbatim): New.
+ (add_predefined_macro, set_macro, macro_set_p): New.
+ (evaluate_conditions, push_condition, pop_condition): New.
+ (parse_file): Rewrite to use the condition stack.
+ (top_parse_file): Set prefined macros.
+ (main): Change -D to define arbitrary macros.
+
+2013-10-25 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: fix pinpad input on Windows.
+ * scd/apdu.c (open_pcsc_reader_direct): Don't call
+ pcsc_vendor_specific_init here, but...
+ (connect_pcsc_card): Call it here.
+
+2013-10-23 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+2013-10-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: add pinpad readers information for PC/SC service.
+ * scd/apdu.c (pcsc_vendor_specific_init): Add information for Cherry
+ ST-2xxx, Reiner cyberJack, Vasco DIGIPASS, FSIJ Gnuk Token, and KAAN
+ Advance.
+
+2013-10-15 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: remove pin length check.
+ * scd/apdu.c (pcsc_pinpad_verify): Remove old check code for pin
+ length.
+
+2013-10-04 Werner Koch <wk at gnupg.org>
+
+ gpg: Limit the nesting level of I/O filters.
+ * common/iobuf.c (MAX_NESTING_FILTER): New.
+ (iobuf_push_filter2): Limit the nesting level.
+
+ * g10/mainproc.c (mainproc_context): New field ANY. Change HAVE_DATA
+ and ANY_SIG_SIGN to bit fields of ANY. Add bit field
+ UNCOMPRESS_FAILED.
+ (proc_compressed): Avoid printing multiple Bad Data messages.
+ (check_nesting): Return GPG_ERR_BAD_DATA instead of UNEXPECTED_DATA.
+
+2013-10-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix bug with deeply nested compressed packets.
+ * g10/mainproc.c (MAX_NESTING_DEPTH): New.
+ (proc_compressed): Return an error code.
+ (check_nesting): New.
+ (do_proc_packets): Check packet nesting depth. Handle errors from
+ check_compressed.
+
+2013-09-08 Werner Koch <wk at gnupg.org>
+
+ Switch to deterministic DSA.
+ * agent/pksign.c (rfc6979_hash_algo_string): New.
+ (do_encode_dsa) [Libgcrypt >= 1.6]: Make use of RFC-6979.
+
+2013-08-30 Werner Koch <wk at gnupg.org>
+
+ scd: Suppress gcc warning about possible uninitialized use.
+ * scd/app-nks.c (parse_pwidstr): Always init r_pwid.
+
+ gpg: Use 2048 as the default keysize in batch mode.
+ * g10/keygen.c (gen_elg, gen_dsa, gen_rsa): Set default keysize to
+ 2048.
+
+ gpgtar: Fix building for systems with a separate libintl.
+ * tools/Makefile.am (gpgtar_LDADD): Add LIBINTL and LIBICONV.
+
+ scd: Use vendor and product id macros also in apdu.c.
+ * scd/ccid-driver.c: Move vendor and product ids to ...
+ * scd/ccid-driver.h: here.
+ * scd/apdu.c (CCID_DRIVER_INCLUDE_USB_IDS): Define to include ids.
+ (pcsc_vendor_specific_init): Use vendor and product id macros.
+
+2013-08-30 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: PC/SC pinpad input improvement.
+ * scd/apdu.c (struct reader_table_s): Add members: PINMIN, PINMAX, and
+ PINPAD_VERLEN_SUPPORTED.
+ (CM_IOCTL_VENDOR_IFD_EXCHANGE, FEATURE_GET_TLV_PROPERTIES,
+ PCSCv2_PART10_PROPERTY_*): New.
+ (new_reader_slot): Initialize pinpad_varlen_supported, pinmin, pinmax.
+ (pcsc_vendor_specific_init): New.
+ (open_pcsc_reader_direct, open_pcsc_reader_wrapped): Call
+ pcsc_vendor_specific_init.
+ (check_pcsc_pinpad): Not detect here but use the result of
+ pcsc_vendor_specific_init.
+ (pcsc_pinpad_verify, pcsc_pinpad_modify): Specify bNumberMessage.
+
+2013-08-29 Jonas Borgström <jonas at borgstrom.se>
+
+ scd: add support for RSA_CRT and RSA_CRT_N key import.
+ * scd/app-openpgp.c (do_writekey): Added RSA_CRT and RSA_CRT_N support.
+
+2013-08-29 Werner Koch <wk at gnupg.org>
+
+ kbx: Add a few macros for easier readability.
+ * kbx/keybox-update.c (FILECOPY_INSERT)
+ (FILECOPY_DELETE, FILECOPY_UPDATE): New macros. Replace numbers by
+ them.
+
+2013-08-28 Werner Koch <wk at gnupg.org>
+
+ Fix commit 04e2c83f.
+ * agent/command-ssh.c (stream_read_string): Do not assign to a NULL
+ ptr.
+
+ gpg: Make decryption with the OpenPGP card work.
+ * scd/app-common.h (APP_DECIPHER_INFO_NOPAD): New.
+ * scd/app-openpgp.c (do_decipher): Add arg R_INFO.
+ * scd/app-nks.c (do_decipher): Add arg R_INFO as a dummy.
+ * scd/app.c (app_decipher): Add arg R_INFO.
+ * scd/command.c (cmd_pkdecrypt): Print status line "PADDING".
+ * agent/call-scd.c (padding_info_cb): New.
+ (agent_card_pkdecrypt): Add arg R_PADDING.
+ * agent/divert-scd.c (divert_pkdecrypt): Ditto.
+ * agent/pkdecrypt.c (agent_pkdecrypt): Ditto.
+ * agent/command.c (cmd_pkdecrypt): Print status line "PADDING".
+ * g10/call-agent.c (padding_info_cb): New.
+ (agent_pkdecrypt): Add arg R_PADDING.
+ * g10/pubkey-enc.c (get_it): Use padding info.
+
+ agent: Fix two compiler warnings.
+ * agent/command.c (cmd_preset_passphrase, pinentry_loopback): Use %zu
+ in format string.
+ * scd/ccid-driver.c (ccid_get_atr): Ditto.
+ * agent/command-ssh.c (stream_read_string): Init arg STRING_SIZE to
+ avoid maybe_unitialized warning.
+
+2013-08-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: fix parsing login-data DO.
+ * scd/app-openpgp.c (parse_login_data): Release RELPTR. Fix parsing.
+
+ scd: fix Vega for Alpha reader.
+ * scd/ccid-driver.c (ccid_vendor_specific_init): Fix error handling
+ and size of command.
+
+2013-08-21 Werner Koch <wk at gnupg.org>
+
+ scd: Make SPRx32 pinpad work with PC/SC on Windows.
+ * scd/apdu.c (CM_IOCTL_GET_FEATURE_REQUEST): Use SCARD_CTL_CODE.
+ (SCARD_CTL_CODE): Define if not defined.
+ (reader_table_s): Add is_spr532.
+ (new_reader_slot): Clear it.
+ (check_pcsc_pinpad): Set it.
+ (pcsc_pinpad_verify, pcsc_pinpad_modify): Add fix for SPR532.
+
+ scd: Improve --enable-pinpad-varlen.
+ * tools/gpgconf-comp.c (gc_options_scdaemon): Add
+ enable-pinpad-varlen.
+ * scd/apdu.c (check_pcsc_pinpad): Detect SPRx32 reader.
+
+2013-08-08 Werner Koch <wk at gnupg.org>
+
+ agent: Extend cmd KEYINFO to return data from sshcontrol.
+ * agent/command-ssh.c (struct control_file_s): Rename to
+ ssh_control_file_s.
+ (ssh_open_control_file, ssh_close_control_file)
+ (ssh_read_control_file, ssh_search_control_file): New.
+ (control_file_t): Rename and move to ...
+ * agent/agent.h (ssh_control_file_t): here.
+ * agent/command.c (do_one_keyinfo): Add args is_ssh, ttl, disabled,
+ and confirm. Rename unknown keytype indicator from '-' to 'X'. Extend
+ output.
+ (cmd_keyinfo): Add options --ssh-list and --with-ssh.
+
+2013-08-02 Werner Koch <wk at gnupg.org>
+
+ gpg: No need to create a trustdb when encrypting with --always-trust.
+ * g10/gpg.c (main): Special case setup_trustdb for --encrypt.
+
+2013-08-01 Werner Koch <wk at gnupg.org>
+
+ w32: Fix recent patch 9ff72e4.
+ * common/homedir.c (check_portable_app): Fix the name of the control
+ file.
+
+ agent: Include missing prototype.
+ * agent/protect.c: Include cvt-openpgp.h.
+
+ w32: Add code to support a portable use of GnuPG.
+ * common/homedir.c (w32_bin_is_bin, w32_portable_app) [W32]: New.
+ (check_portable_app) [W32]: New.
+ (standard_homedir, default_homedir) [W32]: Support the portable flag.
+ (w32_rootdir, w32_commondir) [W32]: Ditto.
+ (gnupg_bindir, gnupg_cachedir, dirmngr_socket_name) [W32]: Ditto.
+ * common/logging.h (JNLIB_LOG_NO_REGISTRY): New.
+ * common/logging.c (no_registry): New variable.
+ (log_set_prefix, log_get_prefix): Set/get that variable.
+ (do_logv): Do not check the registry if that variable is set.
+
+ Silence compiler warning about deprecated Libgcrypt symbols.
+ * configure.ac (AH_BOTTOM): Define GCRYPT_NO_DEPRECATED.
+
+ dirmngr: Define missing LDAP constant.
+ * dirmngr/ldap-url.c (LDAP_SCOPE_DEFAULT): Define if missing.
+
+ scd: Fix a syntax error for Apple and Windows.
+ * scd/apdu.c (pcsc_dword_t) [W32]: Fix syntax error.
+
+ common: Fix a build error when using adns.
+ * common/dns-cert.c (get_dns_cert) [USE_ADNS]: Fix synatx error.
+
+2013-07-31 Werner Koch <wk at gnupg.org>
+
+ common: Comment out unused code.
+ * common/w32-reg.c (write_w32_registry_string): Comment out.
+
+ dirmngr: Remove unused file.
+ * dirmngr/get-path.c: Remove.
+
+2013-06-27 Werner Koch <wk at gnupg.org>
+
+ sm: Remove cruft from source files.
+ * sm/keydb.c, sm/keydb.h: Remove disabled code parts.
+
+ Prepare for newer automake versions.
+ * configure.ac (AM_INIT_AUTOMAKE): Replace 2 argument form by the
+ option form. Add options from the top Makefile.
+ (AM_CONFIG_HEADER): Rename to AC_CONFIG_HEADER.
+ * Makefile.am (AUTOMAKE_OPTIONS): Remove.
+
+ * kbx/Makefile.am: Remove INCLUDES. Include cmacros.am. FActor some
+ AM_CPPFLAGS options to AM_CFLAGS.
+
+2013-06-26 Werner Koch <wk at gnupg.org>
+
+ Fix Makefile regression.
+ * agent/Makefile.am (gpg_agent_DEPENDENCIES): Remove cruft from wrong
+ resolve conflict 2013-04-25.
+ (gpg_agent_DEPENDENCIES): Remove obsolete gpg_agent_res_deps
+ (gpg_agent_LDFLAGS): Remove obsolete gpg_agent_res_ldflags.
+
+2013-05-22 Werner Koch <wk at gnupg.org>
+
+ Implement unattended OpenPGP secret key import.
+ * agent/command.c (cmd_import_key): Add option --unattended.
+ * agent/cvt-openpgp.c (convert_transfer_key): New.
+ (do_unprotect): Factor some code out to ...
+ (prepare_unprotect): new function.
+ (convert_from_openpgp): Factor all code out to ...
+ (convert_from_openpgp_main): this. Add arg 'passphrase'. Implement
+ openpgp-native protection modes.
+ (convert_from_openpgp_native): New.
+ * agent/t-protect.c (convert_from_openpgp_native): New dummy fucntion
+ * agent/protect-tool.c (convert_from_openpgp_native): Ditto.
+ * agent/protect.c (agent_unprotect): Add arg CTRL. Adjust all
+ callers. Support openpgp-native protection.
+ * g10/call-agent.c (agent_import_key): Add arg 'unattended'.
+ * g10/import.c (transfer_secret_keys): Use unattended in batch mode.
+
+ New debug functions log_printcanon and log_printsexp.
+ * common/sexputil.c (sexp_to_string, canon_sexp_to_string): New.
+ (log_printcanon, log_printsexp): New.
+
+ agent: Fix length detection of canonical formatted openpgp keys.
+ * agent/command.c (cmd_import_key): Pass 0 instead of KEYLEN to
+ gcry_sexp_canon_len.
+
+ agent: New option --disable-check-own-socket.
+ * agent/gpg-agent.c (oDisableCheckOwnSocket): New.
+ (disable_check_own_socket): New.
+ (parse_rereadable_options): Set new option.
+ (check_own_socket): Implement new option.
+
+2013-05-07 Werner Koch <wk at gnupg.org>
+
+ w32: Add icons and version information.
+ * common/gnupg.ico: New. Take from artwork/gnupg-favicon-1.ico.
+ * agent/gpg-agent-w32info.rc: New.
+ * g10/gpg-w32info.rc: New.
+ * scd/scdaemon-w32info.rc: New.
+ * sm/gpgsm-w32info.rc: New.
+ * tools/gpg-connect-agent-w32info.rc: New.
+ * common/w32info-rc.h.in: New.
+ * configure.ac (BUILD_REVISION, BUILD_FILEVERSION, BUILD_TIMESTAMP)
+ (BUILD_HOSTNAME): New.
+ (AC_CONFIG_FILES): Add w32info-rc.h.
+ * am/cmacros.am (.rc.o): New rule.
+ * agent/Makefile.am, common/Makefile.am, g10/Makefile.am
+ * scd/Makefile.am, sm/Makefile.am, tools/Makefile.am: Add stuff to
+ build resource files.
+
+2013-05-07 Ian Abbott <abbotti at mev.co.uk>
+
+ doc: fix some Texinfo warnings.
+ * doc/gpg.texi: Fix syntax and add missing menu entries.
+ * doc/gpgsm.texi: Fix subsectioning.
+
+2013-04-22 Werner Koch <wk at gnupg.org>
+
+ Fix potential heap corruption in "gpg -v --version".
+ * g10/gpg.c (build_list): Rewrite to cope with buffer overflow in
+ certain locales.
+
+2013-04-19 Werner Koch <wk at gnupg.org>
+
+ gpgsm: Remove non-implemented commands from --help.
+ * sm/gpgsm.c (opts): Removed commands --clearsign, --symmetric,
+ --send-keys, and --recv-keys.
+
+2013-04-19 Daiki Ueno <ueno at gnu.org>
+
+ Make sure to call fflush if estream_t is backed with stdio.
+ * common/estream.c (es_func_fp_write): Call fflush after fwrite.
+
+2013-04-19 Werner Koch <wk at gnupg.org>
+
+ doc: Formatting fixes.
+ * doc/Makefile.am (.fig.jpg): Correct to use -L jpeg.
+ * doc/gpg.texi: Fix cross reference for --options.
+ * doc/gpgsm.texi: Likewise.
+ * doc/gpl.texi: Fix enumerate and re-indent examples.
+
+2013-04-01 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: move SCDaemon to libexecdir.
+ * common/homedir.c (gnupg_module_name): It's now libexecdir.
+ * scd/Makefile.am (libexec_PROGRAMS): Add scdaemon
+ (bin_PROGRAMS): Remove scdaemon.
+
+2013-03-29 Werner Koch <wk at gnupg.org>
+
+ copyright assignments are not anymore required.
+
+2013-03-26 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: PC/SC status fix.
+ * scd/apdu.c (pcsc_get_status_direct): Check PCSC_STATE_MUTE only when
+ PCSC_STATE_PRESENT.
+
+ * scd/pcsc-wrapper.c (handle_status): Ditto.
+
+ scd: PC/SC cleanup (more).
+ * scd/apdu.c (control_pcsc_direct, control_pcsc_wrapped, control_pcsc)
+ (check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify): Use
+ pcsc_dword_t.
+
+ scd: call update_card_removed only when detecting removal.
+ * scd/command.c (update_reader_status_file): Add condition
+ vr->status == 0.
+
+2013-03-22 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: PC/SC cleanup.
+ * scd/apdu.c (pcsc_dword_t): New. It was named as DWORD (double-word)
+ when a word was 16-bit.
+ (struct reader_table_s): Fixes for types.
+ (struct pcsc_readerstate_s) [__APPLE__]: Enable #pragma pack(1).
+ Throughout: Fixes for types.
+
+ * scd/pcsc-wrapper.c: Likewise.
+
+2013-03-21 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Enable ja.po.
+ * po/LINGUAS: Enable ja.po.
+
+ scd: change default value of pinpad maxlen.
+ * scd/apdu.c (pcsc_pinpad_verify, pcsc_pinpad_modify): Default value
+ of maxlen for pinpad input is now 15 (was: 25).
+
+ * scd/ccid-driver.c (ccid_transceive_secure): Likewise.
+
+2013-03-20 Werner Koch <wk at gnupg.org>
+
+ Add code to allow for late memory cleanup.
+ * common/init.c (mem_cleanup_item_t): New.
+ (run_mem_cleanup): New.
+ (_init_common_subsystems): Add an atexit for it.
+ (register_mem_cleanup_func): New.
+
+ * g10/kbnode.c (cleanup_registered): New.
+ (release_unused_nodes): New.
+ (alloc_node): Call register_mem_cleanup_func.
+
+ kbx: Remove unused macro.
+ * kbx/keybox.h (KEYBOX_WITH_OPENPGP): Remove unused macro.
+
+2013-03-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Print indicator for unknown key capability.
+ * g10/keylist.c (print_capabilities): Print '?' for unknown usage.
+
+2013-03-19 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: Allow setting of all zero key flags.
+ * g10/keygen.c (do_add_key_flags): Do not check for empty key flags.
+
+2013-03-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Distinguish between missing and cleared key flags.
+ * include/cipher.h (PUBKEY_USAGE_NONE): New.
+ * g10/getkey.c (parse_key_usage): Set new flag.
+
+2013-03-15 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: ccid-driver supporting larger APDU.
+ * scd/ccid-driver.c (ccid_transceive_apdu_level): Support larger
+ APDU.
+
+ scd: fix missing close paren.
+ * scd/app-openpgp.c (du_auth): Fix.
+
+2013-03-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: support ECDSA signing.
+ * scd/app-openpgp.c (do_sign): Only prepend message digest block
+ for RSA or do_auth.
+ (do_auth): Remove message digest block for ECDSA.
+
+2013-03-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: support ECDSA public key.
+ * scd/app-openpgp.c (key_type_t): New.
+ (CURVE_NIST_P256, CURVE_NIST_P384, CURVE_NIST_P521): New.
+ (struct app_local_s): Change keyattr to have key_type and union.
+ (get_ecc_key_parameters, get_curve_name): New.
+ (send_key_attr, get_public_key): Support ECDSA.
+ (build_privkey_template, do_writekey, do_genkey): Follow the change
+ of the member KEY_ATTR.
+ (parse_historical): New.
+ (parse_algorithm_attribute): Support ECDSA.
+
+2013-03-05 Werner Koch <wk at gnupg.org>
+
+ Require libgpg-error 1.11.
+ * configure.ac: Require libgpg-error 1.11.
+ * common/util.h (GPG_ERR_NO_KEYSERVER, GPG_ERR_INV_CURVE)
+ (GPG_ERR_UNKNOWN_CURVE): Remove fallback definitions.
+
+2013-02-28 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: pksign result conversion to sexp to upper layer.
+ * agent/agent.h (divert_pksign): Add R_SIGLEN argument.
+ * agent/divert-scd.c (divert_pksign): Return length at R_SIGLEN.
+ * agent/call-scd.c (agent_card_pksign): Move composition of
+ S-expression to...
+ * agent/pksign.c (agent_pksign_do): ... here.
+
+2013-02-22 Werner Koch <wk at gnupg.org>
+
+ Use has_leading_keyword in the assuan callbacks.
+ * agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
+ * agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
+ * g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
+ (inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
+ * g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
+ * sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
+ (inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
+ (keyinfo_status_cb, inq_import_key_parms): Ditto.
+ * sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
+ (lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
+
+ Remove some unused variables.
+ * tools/gpgconf-comp.c (gc_process_gpgconf_conf): Remove unused
+ used_components.
+ * agent/command-ssh.c (ssh_signature_encoder_ecdsa): Mark unused arg.
+ * g13/g13.c (main): Comment variable of yet unimplemented options.
+
+ gpg: Fix a memory leak in batch key generation.
+ * g10/keygen.c (append_to_parameter): New.
+ (proc_parameter_file): Use new func to extend the parameter list.
+
+ * g10/passphrase.c (passphrase_to_dek_ext): Print a diagnostic of
+ gcry_kdf_derive failed.
+ * g10/keygen.c (proc_parameter_file): Print a diagnostic if
+ passphrase_to_dek failed.
+
+ gpg: Handle the agent's NEW_PASSPHRASE inquiry.
+ * g10/call-agent.c (default_inq_cb): Take care of NEW_PASSPHRASE.
+
+ common: Add func has_leading_keyword.
+ * common/stringhelp.c (has_leading_keyword): New.
+
+ Remove build hacks for FreeBSD.
+ * configure.ac [freebsd]: Do not add /usr/local to CPPFLAGS and
+ LDFLAGS.
+
+2013-02-22 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: fix two bugs.
+ * agent/command.c (cmd_keytocard): Decrement KEYDATALEN.
+ * agent/findkey.c (agent_public_key_from_file): Increment for ELEMS.
+
+ gpg: fix keytocard and support ECC card for key attribute.
+ * g10/call-agent.c (agent_keytocard): Supply PARM arg.
+ * g10/card-util.c (card_status): Support ECC.
+ (card_store_subkey): Don't assume RSA.
+
+2013-02-21 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix a memory leak in batch key generation.
+ * g10/keygen.c (append_to_parameter): New.
+ (proc_parameter_file): Use new func to extend the parameter list.
+
+ * g10/passphrase.c (passphrase_to_dek_ext): Print a diagnostic of
+ gcry_kdf_derive failed.
+ * g10/keygen.c (proc_parameter_file): Print a diagnostic if
+ passphrase_to_dek failed.
+
+ gpg: Handle the agent's NEW_PASSPHRASE inquiry.
+ * g10/call-agent.c (default_inq_cb): Take care of NEW_PASSPHRASE.
+
+ common: Add func has_leading_keyword.
+ * common/stringhelp.c (has_leading_keyword): New.
+
+2013-02-20 Werner Koch <wk at gnupg.org>
+
+ Remove build hacks for FreeBSD.
+ * configure.ac [freebsd]: Do not add /usr/local to CPPFLAGS and
+ LDFLAGS.
+
+2013-02-12 NIIBE Yutaka <gniibe at fsij.org>
+
+ gpg: Implement card_store_subkey again.
+ * g10/call-agent.h (agent_keytocard): New.
+ * g10/call-agent.c (agent_keytocard): New.
+ * g10/card-util.c (replace_existing_key_p): Returns 1 when replace.
+ (card_generate_subkey): Check return value of replace_existing_key_p.
+ (card_store_subkey): Implement again using agent_keytocard.
+
+ agent: Add KEYTOCARD command.
+ * agent/agent.h (divert_writekey, agent_card_writekey): New.
+ * agent/call-scd.c (inq_writekey_parms, agent_card_writekey): New.
+ * agent/command.c (cmd_keytocard, hlp_keytocard): New.
+ (register_commands): Add cmd_keytocard.
+ * agent/divert-scd.c (divert_writekey): New.
+
+ Japanese: update po and doc.
+ * doc/help.ja.txt, po/ja.po: Updated.
+
+2013-02-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Rename 'keypad' to 'pinpad'.
+ * NEWS: Mention scd changes.
+
+ * agent/divert-scd.c (getpin_cb): Change message.
+
+ * agent/call-scd.c (inq_needpin): Change the protocol to
+ POPUPPINPADPROMPT and DISMISSPINPADPROMPT.
+ * scd/command.c (pin_cb): Likewise.
+
+ * scd/apdu.c (struct reader_table_s): Rename member functions.
+ (check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify,
+ check_ccid_pinpad, ccid_pinpad_operation, apdu_check_pinpad
+ apdu_pinpad_verify, apdu_pinpad_modify): Rename.
+
+ * scd/apdu.h (SW_HOST_NO_PINPAD, apdu_check_pinpad)
+ (apdu_pinpad_verify, apdu_pinpad_modify): Rename.
+
+ * scd/iso7816.h (iso7816_check_pinpad): Rename.
+
+ * scd/iso7816.c (map_sw): Use SW_HOST_NO_PINPAD.
+ (iso7816_check_pinpad): Rename.
+ (iso7816_verify_kp, iso7816_change_reference_data_kp): Follow
+ the change.
+
+ * scd/ccid-driver.h (CCID_DRIVER_ERR_NO_PINPAD): Rename.
+ * scd/ccid-driver.c (ccid_transceive_secure): Use it.
+
+ * scd/app-dinsig.c (verify_pin): Follow the change.
+ * scd/app-nks.c (verify_pin): Follow the change.
+
+ * scd/app-openpgp.c (check_pinpad_request): Rename.
+ (parse_login_data, verify_a_chv, verify_chv3, do_change_pin): Follow
+ the change.
+
+ * scd/scdaemon.c (oDisablePinpad, oEnablePinpadVarlen): Rename.
+
+ * scd/scdaemon.h (opt): Rename to disable_pinpad,
+ enable_pinpad_varlen.
+
+ * tools/gpgconf-comp.c (gc_options_scdaemon): Rename to
+ disable-pinpad.
+
+2013-02-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Add pinentry-mode feature.
+ * g10/gpg.c: Include shareddefs.h.
+ (main): Add option --pinentry-mode.
+ * g10/options.h (struct opt): Add field pinentry_mode.
+ * g10/passphrase.c: Include shareddefs.h.
+ (have_static_passphrase): Take care of loopback pinentry_mode.
+ (read_passphrase_from_fd): Ditto.
+ (get_static_passphrase): New.
+ (passphrase_to_dek_ext): Factor some code out to ...
+ (emit_status_need_passphrase): new.
+ * g10/call-agent.c (start_agent): Send the pinentry mode.
+ (default_inq_cb): Take care of the PASSPHRASE inquiry. Return a
+ proper error code.
+ (agent_pksign): Add args keyid, mainkeyid and pubkey_algo.
+ (agent_pkdecrypt): Ditto.
+ * g10/pubkey-enc.c (get_it): Pass new args.
+ * g10/sign.c (do_sign): Pass new args.
+
+ * g10/call-agent.c (struct default_inq_parm_s): New. Change all
+ similar structs to reference this one. Change all users and inquire
+ callback to use this struct, instead of NULL or some undefined but not
+ used structs. This change will help to eventually get rid of global
+ variables.
+
+2013-02-06 Werner Koch <wk at gnupg.org>
+
+ agent: Move a typedef to common and provide parse_pinentry_mode.
+ * common/agent-opt.c: New.
+ * common/shareddefs.h: New.
+ * common/Makefile.am: Add new files.
+ * agent/agent.h: Include shareddefs.h.
+ (pinentry_mode_t): Factor out to shareddefs.h.
+ * agent/command.c (option_handler): Use parse_pinentry_mode.
+
+ agent: Return a better error code if no passphrase was given.
+ * agent/protect.c (hash_passphrase): Handle an empty passphrase.
+
+2013-02-05 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix check_keypad_request.
+ * scd/app-openpgp.c (check_keypad_request): 0 means not to use pinpad.
+
+ SCD: Add vendor specific initalization.
+ * scd/ccid-driver.c (ccid_vendor_specific_init): New.
+ (ccid_open_reader): Call ccid_vendor_specific_init.
+
+ SCD: Support P=N format for login data.
+ * scd/app-openpgp.c (parse_login_data): Support P=N format.
+
+ SCD: Better interoperability.
+ * scd/apdu.c: Fill bTeoPrologue[2] field.
+
+ SCD: Defaults to use pinpad if the reader has the capability.
+ * scd/app-openpgp.c (struct app_local_s): Remove VARLEN.
+ (parse_login_data): "P=0" means to disable pinpad.
+ (check_keypad_request): Default is to use pinpad if available.
+
+ SCD: handle keypad request on the card.
+ * scd/app-openpgp.c: Add 2013.
+ (struct app_local_s): Add keypad structure.
+ (parse_login_data): Add parsing keypad request on the card.
+ (check_keypad_request): New.
+ (verify_a_chv, verify_chv3, do_change_pin): Call check_keypad_request
+ to determine use of keypad.
+
+ SCD: Minor fix of ccid-driver.
+ * scd/ccid-driver.c (VENDOR_VEGA): Fix typo.
+
+ SCD: Add support of Covadis VEGA_ALPHA reader.
+ * scd/ccid-driver.c: Add 2013.
+ (VENDER_VEGA, VEGA_ALPHA):New.
+ (ccid_transceive_secure): VEGA_ALPHA is same firmware as GEMPC_PINPAD.
+ Change bNumberMessage to 0x01, as it works better (was: 0xff).
+
+ SCD: Support fixed length PIN input for keypad (PC/SC).
+ * scd/apdu.c (pcsc_keypad_verify): SUpport fixed length PIN input for
+ keypad.
+ (pcsc_keypad_modify): Likewise.
+ * scd/ccid-driver.c (ccid_transceive_secure): Clean up.
+
+ SCD: Support fixed length PIN input for keypad.
+ * scd/iso7816.h (struct pininfo_s): Remove MODE and add FIXEDLEN.
+ * scd/app-dinsig.c (verify_pin): Initialize FIXEDLEN to unknown.
+ * scd/app-nks.c (verify_pin): Likewise.
+ * scd/app-openpgp.c (verify_a_chv, verify_chv3, do_change_pin):
+ Likewise.
+ * scd/apdu.c (check_pcsc_keypad): Add comment.
+ (pcsc_keypad_verify, pcsc_keypad_modify): PC/SC driver only support
+ readers with the feature of variable length input (yet).
+ (apdu_check_keypad): Set FIXEDLEN.
+ * scd/ccid-driver.c (ccid_transceive_secure): Add GEMPC_PINPAD
+ specific settings.
+ Support fixed length PIN input for keypad.
+
+ SCD: API cleanup for keypad handling.
+ * scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
+ Change meaning of MODE.
+ (pininfo_t): Rename from iso7816_pininfo_t.
+ * scd/sc-copykeys.c: Include "iso7816.h".
+ * scd/scdaemon.c, scd/command.c: Likewise.
+ * scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
+ (ccid_transceive_secure): Follow the change of PININFO_T.
+ * scd/app.c: Include "apdu.h" after "iso7816.h".
+ * scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
+ (iso7816_change_reference_data_kp): Follow the change of API.
+ * scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
+ KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
+ (check_pcsc_keypad, check_ccid_keypad): Likewise.
+ (apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
+ (pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
+ (pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
+ (send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
+ (send_le): Follow the change of API.
+ * scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
+ (apdu_keypad_modify): Change the API.
+ * scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
+ change.
+
+ SCD: Clean up. Remove PADLEN for keypad input.
+ * scd/apdu.c (struct pininfo_s): Use iso7816_pininfo_s.
+ (struct reader_table_s): Remove last arg from check_keypad method.
+ (check_pcsc_keypad, check_pcsc_keypad): Remove PIN_PADLEN.
+ (pcsc_keypad_verify, pcsc_keypad_modify): Don't check PIN_PADLEN.
+ (send_apdu_ccid, ccid_keypad_operation): Remove PIN_PADLEN.
+ (apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify):
+ Likewise.
+
+ * scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
+ (apdu_keypad_modify): Remove PIN_PADLEN.
+
+ * scd/ccid-driver.c (ccid_transceive_secure): Remove PIN_PADLEN.
+
+ * scd/ccid-driver.h (ccid_transceive_secure): Remove PIN_PADLEN.
+
+ * scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
+ (iso7816_change_reference_data_kp): Remove PADLEN.
+
+ * scd/iso7816.h (struct iso7816_pininfo_s): Remove PADLEN, PADCHAR.
+
+ SCD: Add option enable-keypad-varlen and support for GEMPC_PINPAD.
+ * scd/scdaemon.h (opt): Add enable_keypad_varlen.
+ * scd/scdaemon.c (cmd_and_opt_values): Add oEnableKeypadVarlen.
+ (opts, main): Add oEnableKeypadVarlen.
+ * scd/ccid-driver.c (GEMPC_PINPAD): New.
+ (ccid_transceive_secure): Add enable_varlen handling.
+ Enable GEMPC_PINPAD.
+
+2013-01-30 Werner Koch <wk at gnupg.org>
+
+ Remove unused status codes.
+ * common/status.h (STATUS_BEGIN_STREAM, STATUS_END_STREAM)
+ (STATUS_SIEXPIRED): Remove unused codes.
+
+ gpg: Add status line PINENTRY_LAUNCHED.
+ * common/status.h (STATUS_PINENTRY_LAUNCHED): New.
+ * g10/server.c (server_local_s): Add field allow_pinentry_notify.
+ (option_handler): Add option "allow-pinentry-notify".
+ (gpg_proxy_pinentry_notify): New.
+ * g10/call-agent.c (default_inq_cb): Factor code out to the new
+ function.
+
+2013-01-25 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix a bug of handling return code from npth_join.
+ * agent/call-pinentry.c (agent_popup_message_stop): Fix npth_join
+ return code.
+
+2013-01-11 Christian Aistleitner <christian at quelltextlich.at>
+
+ gpg: Fix honoring --cert-digest-algo when recreating a cert.
+ * g10/sign.c (update_keysig_packet): Override original signature's
+ digest algo in hashed data and for hash computation.
+
+2013-01-11 Werner Koch <wk at gnupg.org>
+
+ Fix spurious cruft from configure summary output.
+ * configure.ac (build_scdaemon_extra): Remove $tmp cruft.
+
+2013-01-11 NIIBE Yutaka <gniibe at fsij.org>
+
+ SCD: Hold lock for pinpad input.
+ * scd/apdu.c (apdu_check_keypad, apdu_keypad_verify)
+ (apdu_keypad_modify): Hold lock to serialize communication.
+
+2013-01-08 Werner Koch <wk at gnupg.org>
+
+ kbx: Switch from MD5 to SHA-1 for the checksum.
+ * kbx/keybox-blob.c (put_membuf): Use a NULL buf to store zero bytes.
+ (create_blob_finish): Write just the needed space.
+ (create_blob_finish): Switch to SHA-1.
+ * kbx/keybox-dump.c (print_checksum): New.
+ (_keybox_dump_blob): Print the checksum and the verification status.
+
+ gpg: Cache keybox searches.
+ * common/iobuf.c (iobuf_seek): Fix for temp streams.
+ * g10/pubkey-enc.c (get_session_key, get_it): Add some log_clock calls.
+ * g10/keydb.c (dump_search_desc): New.
+ (enum_keyblock_states, struct keyblock_cache): New.
+ (keyblock_cache_clear): New.
+ (keydb_get_keyblock, keydb_search): Implement a keyblock cache.
+ (keydb_update_keyblock, keydb_insert_keyblock, keydb_delete_keyblock)
+ (keydb_rebuild_caches, keydb_search_reset): Clear the cache.
+
+ Make log_clock easier to read.
+ * common/logging.c (log_clock): Print in microseconds.
+
+ gpg: Remove a function wrapper.
+ * g10/keydb.h (keydb_search): Remove macro.
+ * g10/keydb.c (keydb_search2): Rename to keydb_search. Change all
+ callers.
+
+2013-01-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ SCD: Support not-so-smart card readers.
+ * scd/ccid-driver.c (struct ccid_driver_s): Add auto_voltage,
+ auto_param, and auto_pps.
+ (parse_ccid_descriptor): Set auto_voltage, auto_param, and auto_pps.
+ Support non-autoconf readers.
+ (update_param_by_atr): New.
+ (ccid_get_atr): Use 5V for PowerOn when auto_voltage is not supported.
+ Use 0x10 when nonnull_nad for SetParameters.
+ Call update_param_by_atr for parsing ATR, and use param for
+ SetParameters.
+ Send PPS if reader requires it and card is negotiable.
+ When bNadValue in the return values of SetParameters == 0,
+ clear handle->nonnull_nad flag.
+
+2013-01-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Set the node flags while retrieving a keyblock.
+ * g10/keydb.c (parse_keyblock_image): Add args PK_NO and UID_NO and
+ set the note flags accordingly.
+ (keydb_get_keyblock): Transfer PK_NO and UID_NO to parse_keyblock_image.
+ * kbx/keybox-search.c (blob_cmp_fpr, blob_cmp_fpr_part)
+ (blob_cmp_name, blob_cmp_mail): Return the key/user number.
+ (keybox_search): Set the key and user number into the found struct.
+ (keybox_get_keyblock): Add args R_PK_NO and R_UID_NO and set them from
+ the found struct.
+
+ New function log_clock.
+ * common/logging.c (log_clock): New.
+ * g10/gpg.c (set_debug): Print clock debug flag.
+ * g10/options.h (DBG_CLOCK_VALUE, DBG_CLOCK): New.
+
+ gpg: Allow searching for user ids in a keybox.
+ * kbx/keybox-search.c (blob_cmp_name): Add arg X509 and adjust for PGP
+ use. Change callers.
+ (blob_cmp_mail): Add arg X509 and find the mailbox offset for PGP.
+ Chnage callers.
+ (has_subject_or_alt): Rename to has_username.
+ (has_username): Allow blobtype PGP.
+ (has_mail): Ditto.
+
+ gpg: Allow generation of more than 4096 keys in one run.
+ * g10/getkey.c (cache_public_key): Make room in the cache if needed.
+
+2013-01-07 NIIBE Yutaka <gniibe at fsij.org>
+
+ Update Japanese Translation.
+ * po/ja.po: Fix wrong translations for designated revocation.
+ Reported by Hideki Saito.
+
+ Conflicts:
+ po/ja.po
+
+2013-01-05 NIIBE Yutaka <gniibe at fsij.org>
+
+ Update Japanese Translation.
+ * po/ja.po: Fix fuzzy translations.
+
+2013-01-03 NIIBE Yutaka <gniibe at fsij.org>
+
+ Update Japanese Translation.
+ * po/ja.po: Update with POT.
+
+ Update Japanese Translation.
+ * po/ja.po: Start from the new one of 2.0.
+
+2012-12-28 Werner Koch <wk at gnupg.org>
+
+ gpg: Add signature cache support to the keybox.
+ * g10/keydb.c (parse_keyblock_image): Add arg SIGSTATUS.
+ (keydb_get_keyblock): Handle it.
+ (build_keyblock_image): Add arg SIGSTATUS.
+ (keydb_insert_keyblock): Handle it.
+ * kbx/keybox-blob.c (pgp_create_sig_part): Add arg SIGSTATUS.
+ (_keybox_create_openpgp_blob): Ditto.
+ * kbx/kbxutil.c (import_openpgp): Adjust for above change.
+ * kbx/keybox.h (KEYBOX_FLAG_SIG_INFO): New.
+ * kbx/keybox-search.c (_keybox_get_flag_location): Handle new flag.
+ (keybox_get_keyblock): Add arg R_SIGSTATUS.
+ * kbx/keybox-update.c (keybox_insert_keyblock): Add arg SIGSTATUS.
+
+ kbxutil: Improve format of the Sig-Expire lines.
+ * kbx/keybox-dump.c (_keybox_dump_blob): Print the expirate timestamp.
+
+ gpg: First working support for keyboxes.
+ * g10/getkey.c (get_pubkey_fast): Improve the assertion.
+ * kbx/keybox.h: Include iobuf.h.
+ * kbx/keybox-blob.c (keyboxblob_uid): Add field OFF.
+ (KEYBOX_WITH_OPENPGP): Remove use of this macro.
+ (pgp_create_key_part_single): New.
+ (pgp_temp_store_kid): Change to use the keybox-openpgp parser.
+ (pgp_create_key_part): Ditto.
+ (pgp_create_uid_part): Ditto.
+ (pgp_create_sig_part): Ditto.
+ (pgp_create_blob_keyblock): Ditto.
+ (_keybox_create_openpgp_blob): Ditto.
+ * kbx/keybox-search.c (keybox_get_keyblock): New.
+ * kbx/keybox-update.c (keybox_insert_keyblock): New.
+ * g10/keydb.c (parse_keyblock_image):
+ (keydb_get_keyblock): Support keybox.
+ (build_keyblock_image): New.
+ (keydb_insert_keyblock): Support keybox.
+
+ * kbx/kbxutil.c (import_openpgp, main): Add option --dry-run and print
+ a kbx file to stdout.
+
+ * kbx/keybox-file.c (_keybox_read_blob2): Allow keyblocks up to 10^6
+ bytes.
+
+ kbxutil: Print algo number and fold similar lines.
+ * kbx/keybox-defs.h (_keybox_openpgp_key_info): Add field ALGO.
+ * kbx/keybox-openpgp.c (parse_key): Store algo.
+ * kbx/kbxutil.c (dump_openpgp_key): Print algo number.
+ * kbx/keybox-dump.c (_keybox_dump_blob): Print identical Sig-Expire
+ value lines with a range of indices.
+
+2012-12-27 Werner Koch <wk at gnupg.org>
+
+ gpg: First patches to support a keybox storage backend.
+ * kbx/keybox-defs.h (_keybox_write_header_blob): Move prototype to ..
+ * kbx/keybox.h: here.
+ * kbx/keybox-init.c (keybox_lock): Add dummy function
+ * g10/keydb.c: Include keybox.h.
+ (KeydbResourceType): Add KEYDB_RESOURCE_TYPE_KEYBOX.
+ (struct resource_item): Add field kb.
+ (maybe_create_keyring_or_box): Add error descriptions to diagnostics.
+ Add arg IS_BOX. Write a header for a new keybox file.
+ (keydb_add_resource): No more need for the force flag. Rename the
+ local variable "force" to "create". Add URL scheme "gnupg-kbx". Add
+ magic test to detect a keybox file. Add basic support for keybox.
+ (keydb_new, keydb_get_resource_name, keydb_delete_keyblock)
+ (keydb_locate_writable, keydb_search_reset, keydb_search2): Add
+ support for keybox.
+ (lock_all, unlock_all): Ditto.
+ * g10/Makefile.am (needed_libs): Add libkeybox.a.
+ (gpg2_LDADD, gpgv2_LDADD): Add KSBA_LIBS as a workaround.
+
+ * g10/keydb.h (KEYDB_RESOURCE_FLAG_PRIMARY)
+ KEYDB_RESOURCE_FLAG_DEFAULT, KEYDB_RESOURCE_FLAG_READONLY): New.
+ * g10/gpg.c, g10/gpgv.c (main): Use new constants.
+
+2012-12-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Import only packets which are allowed in a keyblock.
+ * g10/import.c (valid_keyblock_packet): New.
+ (read_block): Store only valid packets.
+
+2012-12-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Make commit 2b3cb2ee actually work.
+ * g10/sign.c (update_keysig_packet): Use digest_algo.
+
+ (cherry-picked from commit d23ec86095714d388acac14b515445fe69f019e9)
+
+ gpg: Suppress "public key already present" in quiet mode.
+ * g10/pkclist.c (find_and_check_key, build_pk_list): Print a
+ diagnostic only in non-quiet mode.
+
+2012-12-18 Werner Koch <wk at gnupg.org>
+
+ common: Add meta option ignore-invalid-option.
+ * common/argparse.c (iio_item_def_s, IIO_ITEM_DEF): New.
+ (initialize): Init field IIO_LIST.
+ (ignore_invalid_option_p): New.
+ (ignore_invalid_option_add): New.
+ (ignore_invalid_option_clear): New.
+ (optfile_parse): Implement meta option.
+
+2012-12-13 Werner Koch <wk at gnupg.org>
+ Hans of Guardian <hans at guardianproject.info>
+
+ utf8conv.c: Add hacks for Android.
+ * common/utf8conv.c [HAVE_ANDROID_SYSTEM]: Do not include iconv.h.
+ (iconv_open, iconv_close, load_libiconv) [HAVE_ANDROID_SYSTEM]: New
+ dummy functions.
+ (set_native_charset) [HAVE_ANDROID_SYSTEM]: Force use of "utf-8".
+ (jnlib_iconv_open) [HAVE_ANDROID_SYSTEM]: Act the same as under W32.
+ (jnlib_iconv) [HAVE_ANDROID_SYSTEM]: Ditto.
+ (jnlib_iconv_close) [HAVE_ANDROID_SYSTEM]: Ditto.
+
+2012-12-13 NIIBE Yutaka <gniibe at fsij.org>
+
+ SCD: Fix the process of writing key or generating key.
+ * scd/app-openpgp.c (store_fpr): Flush KEY-FPR and KEY-TIME.
+
+2012-12-12 Werner Koch <wk at gnupg.org>
+
+ ssh: Support ECDSA keys.
+ * agent/command-ssh.c (SPEC_FLAG_IS_ECDSA): New.
+ (struct ssh_key_type_spec): Add fields CURVE_NAME and HASH_ALGO.
+ (ssh_key_types): Add types ecdsa-sha2-nistp{256,384,521}.
+ (ssh_signature_encoder_t): Add arg spec and adjust all callers.
+ (ssh_signature_encoder_ecdsa): New.
+ (sexp_key_construct, sexp_key_extract, ssh_receive_key)
+ (ssh_convert_key_to_blob): Support ecdsa.
+ (ssh_identifier_from_curve_name): New.
+ (ssh_send_key_public): Retrieve and pass the curve_name.
+ (key_secret_to_public): Ditto.
+ (data_sign): Add arg SPEC and change callers to pass it.
+ (ssh_handler_sign_request): Get the hash algo from SPEC.
+ * common/ssh-utils.c (get_fingerprint): Support ecdsa.
+
+ * agent/protect.c (protect_info): Add flag ECC_HACK.
+ (agent_protect): Allow the use of the "curve" parameter.
+ * agent/t-protect.c (test_agent_protect): Add a test case for ecdsa.
+
+ * agent/command-ssh.c (ssh_key_grip): Print a better error code.
+
+2012-12-11 Werner Koch <wk at gnupg.org>
+
+ ssh: Rewrite a function for better maintainability.
+ * agent/command-ssh.c (ssh_signature_encoder_dsa): Rewrite.
+
+2012-12-10 Werner Koch <wk at gnupg.org>
+
+ ssh: Improve key lookup for many keys.
+ * agent/command-ssh.c: Remove dirent.h.
+ (control_file_s): Add struct item.
+ (rewind_control_file): New.
+ (search_control_file): Factor code out to ...
+ (read_control_file_item): New.
+ (ssh_handler_request_identities): Change to iterate over entries in
+ sshcontrol.
+
+ ssh: Cleanup sshcontrol file access code.
+ * agent/command-ssh.c (SSH_CONTROL_FILE_NAME): New macro to replace
+ the direct use of the string.
+ (struct control_file_s, control_file_t): New.
+ (open_control_file, close_control_file): New. Use them instead of
+ using fopen/fclose directly.
+
+ agent: Add envvar "gnupg_SSH_AUTH_SOCK_by"
+ * agent/gpg-agent.c (main): Pass new envar gnupg_SSH_AUTH_SOCK_by to
+ an invoked process.
+
+ config: Update npth.m4.
+ * m4/npth.m4: Take from current npth master.
+
+2012-12-04 NIIBE Yutaka <gniibe at fsij.org>
+
+ Revert SCD changes of 2010-05-03.
+ * scd/apdu.c (pcsc_no_service): Remove.
+ (open_pcsc_reader_direct, open_pcsc_reader_wrapped): Remove
+ pcsc_no_service support.
+ (apdu_open_reader): Remove R_NO_SERVICE.
+ * scd/apdu.h (apdu_open_reader): Remove R_NO_SERVICE.
+ * scd/command.c (reader_disabled): Remove.
+ (get_current_reader): Follow the change of R_NO_SERVICE.
+ (open_card, cmd_serialno, scd_command_handler): Remove reader_disabled
+ support.
+ * scd/sc-copykeys.c (main): Follow the change of R_NO_SERVICE.
+
+ Don't keep opening unavailable card reader.
+ * scd/command.c (update_reader_status_file): Don't call
+ get_current_reader.
+
+2012-11-30 David Shaw <dshaw at jabberwocky.com>
+
+ Refresh sample keys.
+
+ Adjust awk to not add trailing whitespace.
+ * mksamplekeys: Tweak awk script to not add trailing whitespace to
+ blank lines (makes git pre-commit hook unhappy)
+
+2012-11-29 David Shaw <dshaw at jabberwocky.com>
+
+ The keyserver search menu should honor --keyid-format.
+ * keyserver.c (print_keyrec): Honor --keyid-format when getting back
+ full fingerprints from the keyserver (the comment in the code was
+ correct, the code was not).
+
+2012-11-27 Werner Koch <wk at gnupg.org>
+
+ Fix printing of ECC algo names in hkp keyserver listings.
+ * g10/keyserver.c (print_keyrec): Map OpenPGP algorithm ids.
+
+2012-11-26 Ben Kibbey <bjk at luxsci.net>
+
+ Check for inet_addr() in -lnsl.
+ * configure.ac: Check for inet_addr() in libnsl.
+
+2012-11-20 Werner Koch <wk at gnupg.org>
+
+ Do not use a broken ttyname.
+ * configure.ac (HAVE_BROKEN_TTYNAME): New ac_define set for Android
+ systems.
+ * common/util.h (gnupg_ttyname): New macro. Change all callers of
+ ttyname to use this macro instead.
+ (ttyname) [W32]: Rename to _gnupg_ttyname and use also if
+ HAVE_BROKEN_TTYNAME is defined.
+ * common/simple-pwquery.c (agent_send_all_options): Keep on using
+ ttyname unless HAVE_BROKEN_TTYNAME is set. This is because this file
+ may be used standalone.
+
+2012-11-16 Werner Koch <wk at gnupg.org>
+
+ Fix non-portable use of chmod in autogen.sh.
+ * autogen.sh: Remove option -c from chmod.
+
+ Improve parsing of the GIT revision number.
+ * configure.ac (mmm4_revision): Use git rev-parse.
+
+ Add an OpenPGP card vendor.
+ * g10/card-util.c (get_manufacturer): Add Yubico.
+
+2012-11-06 Werner Koch <wk at gnupg.org>
+
+ agent: Use wipememory instead of memset in one place.
+ * agent/command.c (clear_outbuf): Use wipememory. Suggested by Ben
+ Kibbey.
+
+ Allow decryption with card keys > 3072 bits.
+ * scd/command.c (MAXLEN_SETDATA): New.
+ (cmd_setdata): Add option --append.
+ * agent/call-scd.c (agent_card_pkdecrypt): Use new option for long
+ data.
+
+ * scd/app-openpgp.c (struct app_local_s): Add field manufacturer.
+ (app_select_openpgp): Store manufacturer.
+ (do_decipher): Print a note for broken cards.
+
+2012-11-02 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix wrong use of gcry_sexp_build_array.
+ * findkey.c (agent_public_key_from_file): Fix use of
+ gcry_sexp_build_array.
+
+2012-10-31 NIIBE Yutaka <gniibe at fsij.org>
+
+ SCD: Upon error, open_pcsc_reader_wrapped does same as _direct.
+ * scd/apdu.c (PCSC_E_NO_SERVICE): New.
+ (open_pcsc_reader_direct): Use PCSC_E_NO_SERVICE.
+ (open_pcsc_reader_wrapped): Set pcsc_no_service.
+
+2012-08-24 Werner Koch <wk at gnupg.org>
+
+ Update and enable French translation.
+ * po/fr.po: Update.
+ * po/LINGUAS: Enable fr.
+
+2012-08-24 David Prévot <taffit at debian.org>
+
+ Fix typos spotted during translations.
+ * agent/genkey.c: s/to to/to/
+ * sm/*.c: s/failed to allocated/failed to allocate/
+ * sm/certlist.c, ./dirmngr/validate.c: s/should have not/should not have/
+ * g10/seskey.c: missing closing parenthesis
+ * dirmngr/crlcache.c: s/may has/may have/
+
+ Consistency fix:
+
+ * g10/gpg.c, kbx/kbxutil.c, sm/gpgsm.c: uppercase after Syntax
+ * dirmngr/dirmngr_ldap: no period in Syntax
+ * dirmngr/dirmngr-client.c: infinitive for option description:
+ s/certificates are expected/expect certificates/
+
+ Keep previous msgids of translated messages.
+ * po/Makefile.in.in: Use --previous with msgmerge.
+
+2012-08-24 Hans-Christoph Steiner <hans at eds.org>
+
+ Fix build system for Android by disabling tests since its x-compiled.
+ * configure.ac (HAVE_ANDROID_SYSTEM, RUN_TESTS): New.
+ (AH_BOTTOM) [__ANDROID__]: Do not re-define ttyname.
+ * Makefile.am: Depend tests on new RUN_TESTS conditional.
+
+2012-08-24 Werner Koch <wk at gnupg.org>
+
+ Fix left over use of jnlib on some platforms.
+ * tools/watchgnupg.c: Take mischelp.h from common/ and not jnlib/.
+
+2012-06-25 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: handle reader/token removal.
+ * scd/apdu.c (pcsc_error_to_sw): PCSC_E_UNKNOWN_READER means
+ SW_HOST_NO_READER.
+
+2012-06-05 Werner Koch <wk at gnupg.org>
+
+ Change all quotes in strings and comments to the new GNU standard.
+ The asymmetric quotes used by GNU in the past (`...') don't render
+ nicely on modern systems. We now use two \x27 characters ('...').
+
+ The proper solution would be to use the correct Unicode symmetric
+ quotes here. However this has the disadvantage that the system
+ requires Unicode support. We don't want that today. If Unicode is
+ available a generated po file can be used to output proper quotes. A
+ simple sed script like the one used for en at quote is sufficient to
+ change them.
+
+ The changes have been done by applying
+
+ sed -i "s/\`\([^'\`]*\)'/'\1'/g"
+
+ to most files and fixing obvious problems by hand. The msgid strings in
+ the po files were fixed with a similar command.
+
+2012-05-24 Werner Koch <wk at gnupg.org>
+
+ Print the hash algorithm in colon mode key listing.
+ * g10/keylist.c (list_keyblock_colon): Print digest_algo.
+
+ Fix type conflict warning.
+ * g10/keylist.c: Change min_cert_level to a byte.
+
+2012-05-11 Werner Koch <wk at gnupg.org>
+
+ Switch to the new automagic beta numbering scheme.
+ * configure.ac: Add all the require m4 magic.
+
+2012-05-08 Werner Koch <wk at gnupg.org>
+
+ Add tweaks for the not anymore patented IDEA algorithm.
+ * g10/keygen.c (keygen_set_std_prefs): Include IDEA only in PGP2
+ compatibility mode.
+ * g10/misc.c (idea_cipher_warn): Remove. Also remove all callers.
+ * common/status.h (STATUS_RSA_OR_IDEA): Remove. Do not emit this
+ status anymore.
+
+ po: Update de.po.
+ * po/de.po: Update.
+
+ common: Remove generated files only during maintainer-clean.
+ * common/Makefile.am (CLEANFILES): Rename to MAINTAINERCLEANFILES.
+
+2012-04-30 Werner Koch <wk at gnupg.org>
+
+ agent: Fix deadlock in trustlist due to the switch to npth.
+ * agent/trustlist.c (clear_trusttable): New.
+ (agent_reload_trustlist): Use new function.
+ (read_trustfiles): Require to be called with lock held.
+ (agent_istrusted): Factor all code out to ...
+ (istrusted_internal): new. Add ALREADY_LOCKED arg. Make sure the
+ table islocked. Do not print TRUSTLISTFLAG stati if called internally.
+ (agent_marktrusted): Replace calls to agent_reload_trustlist by
+ explicit code.
+
+2012-04-26 NIIBE Yutaka <gniibe at fsij.org>
+
+ make DNS and URI fields work in gpgsm --gen-key.
+ * sm/certreqgen-ui.c (gpgsm_gencertreq_tty): Actually set mb_uri and
+ mb_dns.avoid buffer strncpy-induced buffer overrun
+
+2012-04-26 Jim Meyering <jim at meyering.net>
+
+ avoid buffer strncpy-induced buffer overrun.
+ * dirmngr/crlcache.c (open_dir): Ensure that both this_update
+ and next_update member strings are NUL-terminated.
+
+ remove doubled words in a comment.
+
+2012-04-20 Werner Koch <wk at gnupg.org>
+
+ Change license for some files in common to LGPLv3+/GPLv2+.
+ Having the LGPL on the common GnuPG code helps to share code
+ between GnuPG and related projects (like GPGME and Libassuan). This
+ is good for interoperability and to reduces bugs.
+
+ * common/asshelp.c, common/asshelp.h, common/asshelp2.c, common/b64dec.c
+ * common/b64enc.c, common/convert.c, common/dns-cert.c
+ * common/dns-cert.h common/exechelp-posix.c, common/exechelp-w32.c
+ * common/exechelp-w32ce.c, common/exechelp.h, common/get-passphrase.c
+ * common/get-passphrase.h, common/gettime.c, common/gpgrlhelp.c
+ * common/helpfile.c, common/homedir.c, common/http.c, common/http.h
+ * common/i18n.c, common/init.c, common/init.h, common/iobuf.c
+ * common/iobuf.h, common/localename.c, common/membuf.c, common/membuf.h
+ * common/miscellaneous.c, common/openpgp-oid.c, common/openpgpdefs.h
+ * common/percent.c, common/pka.c, common/pka.h, common/session-env.c
+ * common/session-env.h, common/sexp-parse.h, common/sexputil.c
+ * common/signal.c, common/srv.c, common/srv.h, common/ssh-utils.c
+ * common/ssh-utils.h, common/sysutils.c, common/sysutils.h
+ * common/tlv.c, common/tlv.h, common/ttyio.c, common/ttyio.h
+ * common/userids.c, common/userids.h, common/xasprintf.c: Change
+ license to LGPLv3+/GPLv2+/
+
+2012-04-10 Ben Kibbey <bjk at luxsci.net>
+
+ Fix killing PID -1.
+ When the KILLSCD command had been sent a race condition would occur
+ causing PID -1 getting killed, which on Linux seems to terminate all
+ applications for the current user.
+
+2012-04-05 Werner Koch <wk at gnupg.org>
+
+ Do not mix test result with progress lines.
+ This makes parsing of the results easier. Fixes bug#1400.
+
+ * tests/openpgp/defs.inc (progress_cancel, progress_end)
+ (progress_new): New.
+ * tests/openpgp/conventional-mdc.test: Use progress functions
+ * tests/openpgp/conventional.test: Ditto.
+ * tests/openpgp/encrypt-dsa.test: Ditto.
+ * tests/openpgp/encrypt.test: Ditto.
+ * tests/openpgp/sigs.test: Ditto.
+
+2012-04-04 Ben Kibbey <bjk at luxsci.net>
+
+ Mention status messages in the documentation.
+ Note INQUIRE_MAXLEN.
+
+ Document PASSWD --preset.
+
+ Document GENKEY options.
+
+ Document PRESET_PASSPHRASE.
+
+ Document CLEAR_PASSPHRASE.
+ And describe the --mode=normal option.
+
+2012-03-27 Werner Koch <wk at gnupg.org>
+
+ Fix timegm regression test.
+ * common/t-timestuff.c (test_timegm): Change test to use January and
+ not February or December+1. Bug spotted by Daniel Kahn Gillmor.
+
+ Print warning for arguments not considered an option.
+ GnuPG requires that options are given before other arguments. This
+ can sometimes be confusing. We now print a warning if we found an
+ argument looking alike a long option without being preceded by the
+ stop option. This is bug#1343.
+
+ * common/argparse.h (ARGPARSE_FLAG_STOP_SEEN): New.
+ * common/argparse.c (arg_parse): Set new flag.
+ * g10/gpg.c (main): Print the warning.
+ * agent/gpg-agent.c (main): Ditto.
+ * dirmngr/dirmngr.c (main): Ditto.
+ * g13/g13.c (main): Ditto.
+ * scd/scdaemon.c (main): Ditto.
+ * sm/gpgsm.c (main): Ditto.
+ * tools/gpg-connect-agent.c (main): Ditto.
+ * tools/gpgconf.c (main): Ditto.
+
+2012-03-26 Werner Koch <wk at gnupg.org>
+
+ Allow compress algorithm 0.
+ * g10/mainproc.c (proc_compressed): Remove superfluous check for
+ compress algorithm 0. Reported by pfandrade. This is bug#1326.
+
+ Add mksamplekeys script.
+ * doc/mksamplekeys: New.
+
+2012-02-28 Marcus Brinkmann <mb at g10code.com>
+
+ Replace npth_yield in busy wait by npth_usleep.
+ * dirmngr/ldap-wrapper.c (ldap_wrapper_wait_connections): Call
+ npth_usleep instead of npth_yield.
+
+2012-02-16 Marcus Brinkmann <mb at g10code.com>
+
+ Check for lber and link dirmngr_ldap to it.
+ * configure.ac (LBER_LIBS, HAVE_LBER): New variables, check for lber.
+ * dirmngr/Makefile.am (dirmngr_lda_LDADD): Add $(LBER_LIBS).
+
+2012-02-07 Werner Koch <wk at gnupg.org>
+
+ agent: Add pin length field to the shadowed private key format.
+ This is not yet fully implemented. It will eventually allow to
+ support pinpad equipped readers which do not support variable length
+ pin lengths.
+ * agent/protect.c (parse_shadow_info): Add optional arg R_PINLEN and
+ parse pinlen info. Change all callers to pass NULL for it.
+
+ Use new status printing functions.
+ * agent/command.c (cmd_geteventcounter): Get rid of static buffers.
+ * scd/command.c (cmd_serialno, cmd_learn): Simplify by using
+ print_assuan_status.
+
+ agent: New function agent_print_status.
+ * common/asshelp2.c (vprint_assuan_status): New.
+ (print_assuan_status): Re-implement using above func.
+ * agent/command.c (agent_print_status): New.
+
+ po: Add Ukrainian translation.
+ * po/uk.po: New.
+
+ common: Replace macro based function calls by using DEFAULT_ERRSOURCE.
+ * common/dns-cert.h (get_dns_cert): Remove macro.
+ * common/dns-cert.c (_get_dns_cert): Rename to get_dns_cert. Replace
+ arg ERRSOURCE by global DEFAULT_ERRSOURCE.
+ * common/http.h (http_parse_uri, http_raw_connect, http_open)
+ (http_open_document, http_wait_response): Remove macros.
+ * common/http.c (_http_parse_uri, _http_raw_connect, _http_open)
+ (_http_open_document, _http_wait_response): Remove underscore from
+ symbols. Replace args ERRSOURCE by global DEFAULT_ERRSOURCE.
+ * common/ssh-utils.h (ssh_get_fingerprint)
+ (ssh_get_fingerprint_string): Remove macros.
+ * common/ssh-utils.h (_ssh_get_fingerprint)
+ (_ssh_get_fingerprint_string): Remove underscore from symbols.
+ Replace args ERRSOURCE by global DEFAULT_ERRSOURCE.
+ * common/tlv.h (parse_ber_header, parse_sexp): Remove macros.
+ * common/tlv.c: Include util.h.
+ (_parse_ber_header, _parse_sexp): Remove underscore from symbols.
+ Replace args ERRSOURCE by global DEFAULT_ERRSOURCE.
+
+2012-02-06 Werner Koch <wk at gnupg.org>
+
+ Add replacement hack for Android's broken ttyname.
+ * configure.ac (HAVE_TTYNAME) [__ANDROID__]: Add hack.
+
+ agent: Simplify printing of INQUIRE_MAXLEN.
+ * agent/command.c: Include asshelp.h.
+ (cmd_pkdecrypt, cmd_genkey, cmd_preset_passphrase)
+ (pinentry_loopback): Use print_assuan_status for INQUIRE_MAXLEN.
+
+ common: Add function print_assuan_status.
+ * common/asshelp2.c: New.
+ (print_assuan_status): New function.
+ * common/Makefile.am (common_sources): Add asshelp2.c.
+
+ common: Add a global variable to for the default error source.
+ For the shared code parts it is cumbersome to pass an error sourse
+ variable to each function. Its value is always a constant for a given
+ binary and thus a global variable makes things a lot easier than the
+ former macro stuff.
+ * common/init.c (default_errsource): New global var.
+ (init_common_subsystems): Rename to _init_common_subsystems. Set
+ DEFAULT_ERRSOURCE.
+ * common/init.h: Assert value of GPG_ERR_SOURCE_DEFAULT.
+ (init_common_subsystems): New macro.
+ * common/util.h (default_errsource): Add declaration.
+ * kbx/keybox-defs.h: Add some GPG_ERR_SOURCE_DEFAULT trickery.
+
+2012-02-03 Ben Kibbey <bjk at luxsci.net>
+
+ Also let GENKEY and PKDECRYPT send the INQUIRE_MAXLEN status message.
+ * agent/command.c (cmd_pkdecrypt): Send the INQUIRE_MAXLEN status
+ message before doing the inquire.
+ (cmd_genkey): Ditto.
+
+2012-02-02 Ben Kibbey <bjk at luxsci.net>
+
+ Inform the client of the preset passphrase length.
+ * agent/command.c (cmd_preset_passphrase): Send the INQUIRE_MAXLEN
+ status message before inquiring the passphrase.
+
+2012-02-01 David Shaw <dshaw at jabberwocky.com>
+
+ Honor --cert-digest-algo when recreating a cert.
+ * g10/sign.c (update_keysig_packet): Honor --cert-digest-algo when
+ recreating a cert.
+
+ This is used by various things in --edit-key like setpref, primary,
+ etc. Suggested by Christian Aistleitner.
+
+2012-01-27 Werner Koch <wk at gnupg.org>
+
+ gl: Add support for Android to stdint.h replacement.
+ * gl/stdint_.h: When included from Bionic <sys/types.h>, just include
+ the system's <stdint.h>.
+
+ gpg-connect-tool: Take the string "true" as a true condition.
+ * tools/gpg-connect-agent.c (main): Handle strings "true" and "yes" in
+ conditions as expected.
+
+2012-01-26 Ben Kibbey <bjk at luxsci.net>
+
+ Return GPG_ERR_CARD_NOT_PRESENT when pinentry-mode=loopback.
+ Since there isn't a way to prompt the user to insert the smartcard when
+ pinentry-mode=loopback, return GPG_ERR_CARD_NOT_PRESENT instead of
+ GPG_ERR_NO_PIN_ENTRY.
+
+ * agent/divert-scd.c (ask_for_card): Return GPG_ERR_CARD_NOT_PRESENT
+ when pinentry-mode=loopback.
+
+ Also check for GPG_ERR_ASS_CANCELED during an inquire.
+ Fix pinentry-mode=loopback when cancelling an inquire from scdaemon.
+ This is similar to commit 4f21f8d but for both protocol command
+ cancellation and pinentry cancellation.
+
+ * agent/call-scd.c (agent_card_pkdecrypt): Check for
+ GPG_ERR_ASS_CANCELED.
+ (agent_card_pksign): Ditto.
+
+2012-01-25 Werner Koch <wk at gnupg.org>
+
+ nPth is now a hard requirement for GnuPG.
+ * configure.ac: Remove cruft to allow building without npth.
+
+ Require libassuan 2.1.0.
+ * configure.ac (NEED_LIBASSUAN_VERSION): Set to 2.1.0. This is due to
+ the npth changes.
+
+ Fix strerror vs. gpg_strerror usage.
+ This bug was introduced by the migration to npth.
+ * agent/gpg-agent.c (handle_connections): Use strerror.
+
+ Add missing variable.
+ * agent/gpg-agent.c (handle_connections) [!W32]: Add missing variable.
+
+2012-01-25 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
+
+ Port LDAP wrapper to NPTH.
+ * agent/gpg-agent.c (handle_connections): Handle error.
+ * dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c: Port to NPTH.
+
+ Port Windows code to NPTH.
+ * agent/gpg-agent.c (get_agent_ssh_socket_name): Use
+ INVALID_HANDLE_VALUE instead of 0.
+ (handle_signal) [!HAVE_W32_SYSTEM]: Don't define.
+ (handle_connections): Port Windows code to NPTH.
+ * dirmngr/dirmngr.c (handle_connections): Port Windows code to NPTH.
+ * g13/g13.c (handle_connections): Port Windows code to NPTH.
+ * scd/scdaemon.c (handle_connections): Port Windows code to NPTH.
+
+ Port to npth.
+ * configure.ac: Don't check for PTH but for NPTH.
+ (AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
+ (have_pth): Rename to ...
+ (have_npth): ... this.
+ (USE_GNU_NPTH): Rename to ...
+ (USE_GNU_PTH): ... this.
+ * m4/npth.m4: New file.
+ * agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
+ agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
+ agent/trustlist.c, common/Makefile.am, common/estream.c,
+ common/exechelp-posix.c, common/exechelp-w32.c,
+ common/exechelp-w32ce.c, common/http.c, common/init.c,
+ common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
+ dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
+ dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
+ g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
+ scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
+ scd/scdaemon.c, tools/Makefile.am: Port to npth.
+
+2012-01-25 Werner Koch <wk at gnupg.org>
+
+ Require gitlog-to-changelog to be installed.
+ * Makefile.am (GITLOG_TO_CHANGELOG): New.
+ (gen-ChangeLog): Use installed version of gitlog-to-changelog.
+
+2012-01-20 David Shaw <dshaw at jabberwocky.com>
+
+ Changes to --min-cert-level should cause a trustdb rebuild (issue 1366)
+ * g10/gpgv.c, g10/trustdb.c (read_trust_options): Add min_cert_level
+
+ * g10/trustdb.c (check_trustdb_stale): Request a rebuild if
+ pending_check_trustdb is true (set when we detect a trustdb
+ parameter has changed).
+
+ * g10/keylist.c (public_key_list): Use 'l' in the "tru" with-colons
+ listing for min_cert_level not matching.
+
+ * g10/tdbio.c (tdbio_update_version_record, create_version_record,
+ tdbio_db_matches_options, tdbio_dump_record, tdbio_read_record,
+ tdbio_write_record): Add a byte for min_cert_level in the tdbio
+ version record.
+
+2012-01-20 Werner Koch <wk at gnupg.org>
+
+ estream: Fix unclean usage of realloc.
+ * common/estream-printf.c (_ESTREAM_PRINTF_MALLOC): Remove.
+ (_ESTREAM_PRINTF_FREE): Remove.
+ (_ESTREAM_PRINTF_REALLOC): New.
+ (fixed_realloc) [!_ESTREAM_PRINTF_REALLOC]): New.
+ (estream_vasprintf): Use my_printf_realloc instead of my_printf_malloc
+ and my_printf_free.
+ (dynamic_buffer_out): Use my_printf_realloc instead of realloc.
+
+ Do not copy default merge commit log entries into the ChangeLog.
+ * scripts/gitlog-to-changelog: Skip merge commits.
+
+2012-01-18 Ben Kibbey <bjk at luxsci.net>
+
+ Add the INQUIRE_MAXLEN status message.
+ This status message is used to inform the client of the maximum length
+ of an inquired passphrase and is used in pinentry-mode=loopback.
+
+ * agent/command.c (pinentry_loopback): Send the INQUIRE_MAXLEN status
+ message before doing the inquire.
+
+2012-01-16 Jim Meyering <meyering at redhat.com>
+
+ yat2m: don't dereference pointer to freed memory.
+ * doc/yat2m.c (top_parse_file): Correct macrolist-freeing loop.
+
+ gpg-agent: fix lc-messages handling not to change Xauthority setting.
+ * agent/gpg-agent.c (main): Supply omitted "break" statement for
+ lc-messages option. Otherwise, control would fall through to the
+ following oXauthority case and use the same value there.
+
+2012-01-15 Werner Koch <wk at gnupg.org>
+
+ Fix indentation.
+
+2012-01-14 Ben Kibbey <bjk at luxsci.net>
+
+ Fix scdaemon pinentry inquire cancelation.
+ Similar to commit 29af488 but also fixes PKDECRYPT and PKSIGN.
+
+ * agent/call-scd.c (agent_card_pkdecrypt): Check for GPG_ERR_CANCELED
+ when returning from the PKDECRYPT operation of scdaemon and cancel the
+ inquire.
+ (agent_card_pksign): Ditto.
+ (cancel_inquire): New.
+
+2012-01-11 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix segv with RSA_S keys.
+ * g10/misc.c (pubkey_get_npkey, pubkey_get_nskey)
+ (pubkey_get_nsig, pubkey_get_nenc): Map all RSA algo ids to
+ GCRY_PK_RSA.
+
+ estream: Avoid printing leading zeroes by %p on 32 bit systems.
+ * common/estream-printf.c (pr_pointer): Synchronize definition of
+ AULONG with its use.
+
+2012-01-11 David Shaw <dshaw at jabberwocky.com>
+
+ Refresh sample keys.
+
+2012-01-10 David Shaw <dshaw at jabberwocky.com>
+
+ Adapt HKP fix for fingerprint/long keyid retrievals for dirmngr.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_get): Use the longest valid keyid form
+
+2012-01-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Make the double space in the middle of a fingerprint optional.
+ This change might help to c+p a fingerprint from an HTML page without
+ being enclosed in a "pre" tag.
+ * common/userids.c (classify_user_id): Skip a second blank in the
+ middle of a fingerprint.
+
+ gpg: Allow use of a standard space separated fingerprint.
+ * common/userids.c (classify_user_id): Check for space separated GPG
+ fingerprint.
+
+2012-01-06 NIIBE Yutaka <gniibe at fsij.org>
+
+ Merge ccid_driver_improvement branch.
+ * scd/apdu.c (ccid_keypad_operation): Rename from ccid_keypad_verify.
+ (open_ccid_reader): Use ccid_keypad_operation for verify and modify.
+
+ * scd/ccid-driver.c (VENDOR_VASCO, VASCO_920): New.
+ (ccid_transceive_apdu_level): Permit sending packet where
+ apdulen <= 289. Support receiving packets in a chain.
+ (ccid_transceive_secure): Maximum is 15 for VASCO DIGIPASS 920.
+ Support keypad_modify method such as CHANGE_REFERENCE_DATA: 0x24.
+
+2012-01-03 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
+
+ Silence gcc warning.
+ * sm/call-dirmngr.c (get_cached_cert): Make sure buflen is initialized.
+
+ Revert last change, add comment about link() return values.
+ * common/dotlock.c (use_hardlinks_p, dotlock_take_unix): Do not check
+ return value of link().
+
+ Fix compiler warnings.
+ * common/dotlock.c (use_hardlinks_p, dotlock_take_unix): Check return
+ value of link().
+ * g13/g13.c: Make sure err is initialized.
+ * scd/scdaemon.c (main) [!USE_GCRY_THREAD_CBS]: Do not define ERR.
+
+ Fix last change: Only set gcrypt thread callback for older versions.
+ * dirmngr/dirmngr.c, g13/g13.c: Rename FIX_GCRY_PTH_INIT to
+ USE_GCRY_THREAD_CBS.
+
+2012-01-03 Werner Koch <wk at gnupg.org>
+
+ Terminate csh commands with a semicolon also for dirmngr.
+ * dirmngr/dirmngr.c (main): Terminate csh style output with a semicolon.
+
+ Terminate csh commands with a semicolon.
+ Fixes bug#1386.
+
+ * agent/gpg-agent.c (main): Terminate csh style output with a semicolon.
+ * scd/scdaemon.c: Ditto.
+
+2012-01-02 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
+
+ Only set gcrypt thread callback for older version of gcrypt.
+ * agent/gpg-agent.c, dirmngr/dirmngr.c, g13/g13.c, scd/scdaemon.c
+ (USE_GCRY_THREAD_CBS): New macro, defined if
+ GCRY_THREAD_OPTION_VERSION is 0.
+ (fixed_gcry_pth_init) [!USE_GCRY_THREAD_CBS]: Don't define.
+ (main) [!USE_GCRY_THREAD_CBS]: Do not install thread callbacks.
+
+2011-12-28 David Shaw <dshaw at jabberwocky.com>
+
+ Use the longest key ID available when talking to a HKP server.
+ This is issue 1340. Now that PKSD is dead, and SKS supports long key
+ IDs, this is safe to do. Patch from Daniel Kahn Gillmor
+ <dkg at fifthhorseman.net>.
+
+2011-12-20 Werner Koch <wk at gnupg.org>
+
+ Post-release version number update.
+
+ Release 2.1.0beta3.
+
+ Prepare for the beta3 release.
+
+ po: Update the German translation.
+
+ Add the STEED Self-Signing Nonthority certificate.
+ * doc/com-certs.pem: Install it when creating a keybox.
+
+ faq: Add section on US export restrictions.
+
+ Require Libassuan 2.0.3.
+ * configure.ac: Require Libassuan 2.0.3.
+ * agent/call-scd.c (ASSUAN_CONVEY_COMMENTS): Remove macro replacement.
+ * agent/command.c (cmd_killagent) [ASSUAN_FORCE_CLOSE]: Remove
+ dependency.
+ (cmd_killagent) [ASSUAN_FORCE_CLOSE]: Ditto.
+ * scd/command.c (cmd_killscd) [ASSUAN_FORCE_CLOSE]: Ditto.
+
+2011-12-20 NIIBE Yutaka <gniibe at fsij.org>
+
+ Add error log and debug log for pcsc_keypad_verify and pcsc_keypad_modify.
+ * scd/apdu.c (pcsc_keypad_verify): Add debug log and error log.
+ (pcsc_keypad_modify): Likewise.
+
+2011-12-19 Werner Koch <wk at gnupg.org>
+ Ben Kibbey <bjk at luxsci.net>
+
+ scd: Fix for card change returning GPG_ERR_CARD_RESET.
+ * scd/apdu.c (apdu_connect): Do not test for zero atrlen.
+
+2011-12-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ Don't kill pinentry by SIGKILL but let it quit by SIGINT.
+ * agent/call-pinentry.c (agent_popup_message_stop): To pinentry, send
+ SIGINT (was: SIGKILL).
+
+2011-12-15 David Shaw <dshaw at jabberwocky.com>
+
+ Merge fix for issue 1331 from 1.4.
+ * photoid.c (generate_photo_id): Check for the JPEG magic numbers
+ instead of JFIF since some programs generate an EXIF header first.
+
+2011-12-15 Werner Koch <wk at gnupg.org>
+
+ scd: Prefer application Geldkarte over DINSIG.
+ * scd/app.c (select_application): Reorder application tests.
+
+ scd: Add option --dump-atr to command APDU.
+ * scd/atr.c: Rewrite.
+ * scd/Makefile.am (scdaemon_SOURCES): Add atr.c and atr.h.
+ * scd/command.c (cmd_apdu): Add option --dump-atr.
+
+ estream: New function es_fclose_snatch.
+ * common/estream.c (cookie_ioctl_function_t): New type.
+ (es_fclose_snatch): New function.
+ (COOKIE_IOCTL_SNATCH_BUFFER): New constant.
+ (struct estream_internal): Add field FUNC_IOCTL.
+ (es_initialize): Clear FUNC_IOCTL.
+ (es_func_mem_ioctl): New function.
+ (es_fopenmem, es_fopenmem_init): Init FUNC_IOCTL.
+
+2011-12-14 Werner Koch <wk at gnupg.org>
+
+ scd: Skip S/N reading for the "undefined" application.
+ * scd/app.c (select_application): Skip serial number reading.
+
+ scd: Add more status word values for documentation.
+
+ scd: Add the "undefined" stub application.
+ * scd/app.c (select_application): Implement the "undefined"
+ application.
+
+ agent: Pass comment lines from scd verbatim thru gpg-agent.
+ * agent/call-scd.c (pass_status_thru): Pass comment lines verbatim.
+ * tools/gpg-connect-agent.c (help_cmd_p): New.
+ (main): Treat an "SCD HELP" the same as "HELP".
+
+ scd: Fix resetting and closing of the reader.
+ * scd/command.c (update_card_removed): Do no act on an invalid VRDR.
+ (do_reset): Ignore apdu_reset error codes for no and inactive card.
+ Close the reader before setting the slot to -1.
+ (update_reader_status_file): Notify the application before closing the
+ reader.
+
+ scd: Add debug option for reader function calls.
+ * scd/scdaemon.h (DBG_READER_VALUE, DBG_READER): New.
+ * scd/apdu.c (apdu_open_reader, apdu_close_reader)
+ (apdu_shutdown_reader, apdu_connect, apdu_disconnect)
+ (apdu_reset, apdu_get_atr, apdu_get_status): Add debug code.
+ (apdu_activate): Remove this unused function.
+
+2011-12-13 Werner Koch <wk at gnupg.org>
+
+ scd: New option --debug-assuan-log-cats.
+ * scd/scdaemon.c (oDebugAssuanLogCats): New.
+ (opts): Add option --debug-assuan-log-cats.
+ (main): Implement option.
+ * common/asshelp.c (set_libassuan_log_cats): New.
+
+ scd: Introduce a virtual reader table.
+ The vreader table makes the code more clear by explicitly talking
+ about APDU slots and reader indices. It also accommodates for future
+ extensions.
+
+ * scd/scdaemon.h (server_control_s): Remove READER_SLOT.
+ * scd/scdaemon.c (scd_init_default_ctrl): Do not init READER_SLOT.
+ * scd/app.c (check_application_conflict): Add arg SLOT.
+ * scd/command.c (slot_status_s): Rename to vreader_s.
+ (server_local_s): Add field VREADER_IDX as replacement for
+ the READER_SLOT in server_control_s. Change all users.
+ (slot_table): Rename to vreader_table. Change all users.
+ (vreader_slot): New.
+ (do_reset, cmd_apdu): Map vreader to apdu slot.
+ (get_reader_slot): Rename to get_current_reader. Return -1 on error.
+ (open_card): Map vreader toapdu slot. Pass slot to
+ check_application_conflict.
+ (scd_command_handler): Init VREADER_IDX.
+ (update_reader_status_file): Reset SLOT field on error.
+
+2011-12-12 Werner Koch <wk at gnupg.org>
+
+ scd: Retry command SERIALNO for an inactive card.
+ * scd/command.c (cmd_serialno): Retry once for an inactive card.
+
+ Fix detection of card removal and insertion.
+ * scd/apdu.c (apdu_connect): Return status codes for no card available
+ and inactive card.
+ * scd/command.c (TEST_CARD_REMOVAL): Also test for GPG_ERR_CARD_RESET.
+ (open_card): Map apdu_connect status to GPG_ERR_CARD_RESET.
+
+ gitlog-to-changelog: New option --tear-off.
+ * scripts/gitlog-to-changelog: Add option --tear-off.
+ * Makefile.am (gen-ChangeLog): Use that option.
+
+2011-12-07 Werner Koch <wk at gnupg.org>
+
+ gpgsm: Add new validation model "steed".
+ * sm/gpgsm.h (VALIDATE_FLAG_STEED): New.
+ * sm/gpgsm.c (gpgsm_parse_validation_model): Add model "steed".
+ * sm/server.c (option_handler): Allow validation model "steed".
+ * sm/certlist.c (gpgsm_cert_has_well_known_private_key): New.
+ * sm/certchain.c (do_validate_chain): Handle the
+ well-known-private-key attribute. Support the "steed" model.
+ (gpgsm_validate_chain): Ditto.
+ * sm/verify.c (gpgsm_verify): Return "steed" in the trust status line.
+ * sm/keylist.c (list_cert_colon): Print the new 'w' flag.
+
+ Correct punctuation in the ChangeLog summary line.
+ * Makefile.am (gen-ChangeLog): Supply --append-dot.
+
+ Allow comments which will not show up in the ChangeLog.
+ * scripts/gitlog-to-changelog: Ignore lines after a "--" line.
+
+2011-12-06 Werner Koch <wk at gnupg.org>
+
+ gpgsm: Allow specification of an AuthorityKeyIdentifier.
+ * sm/certreqgen.c (pAUTHKEYID): New.
+ (read_parameters): Add keyword Authority-Key-Id.
+ (proc_parameters): Check its value.
+ (create_request): Insert an Authority-Key-Id.
+
+ gpgsm: Allow arbitrary extensions for cert creation.
+ * sm/certreqgen.c (pSUBJKEYID, pEXTENSION): New.
+ (read_parameters): Add new keywords.
+ (proc_parameters): Check values of new keywords.
+ (create_request): Add SubjectKeyId and extensions.
+ (parse_parameter_usage): Support "cert" and the encrypt alias "encr".
+
+ gpgsm: Fix storing of the serial number.
+ * sm/certreqgen.c (create_request): Fix hex-bin conversion.
+
+2011-12-05 Werner Koch <wk at gnupg.org>
+
+ Fix last change.
+ * agent/command.c (start_command_handler): Remove use of removed var.
+
+ Amend the agent code with more comments.
+ * agent/command.c (server_local_s): Remove unused field MESSAGE_FD.
+
+2011-12-02 Werner Koch <wk at gnupg.org>
+
+ Support the Cherry ST-2000 card reader.
+ * scd/ccid-driver.c (SCM_SCR331, SCM_SCR331DI, SCM_SCR335)
+ (SCM_SCR3320, SCM_SPR532, CHERRY_ST2000): New constants.
+ (parse_ccid_descriptor): Use them.
+ (scan_or_find_usb_device, ccid_transceive_secure): Handle Cherry
+ ST-2000. Suggested by Matthias-Christian Ott.
+
+ Avoid possible double free in export.c.
+ * g10/export.c (transfer_format_to_openpgp): Avoid possible double
+ free of LIST. Reported by NIIBE Yutaka.
+
+2011-12-02 NIIBE Yutaka <gniibe at fsij.org>
+
+ Fix pinpad input support for passphrase modification.
+ * apdu.c (pcsc_keypad_verify): Have dummy Lc field with value 0.
+ (pcsc_keypad_modify): Likewise.
+ (pcsc_keypad_modify): It's only for ISO7816_CHANGE_REFERENCE_DATA.
+ bConfirmPIN value is determined by the parameter p0.
+
+ * app-openpgp.c (do_change_pin): The flag use_keypad should be 0 when
+ reset_mode is on, or resetcode is on. use_keypad only makes sense for
+ iso7816_change_reference_data_kp.
+
+ * iso7816.h (iso7816_put_data_kp): Remove.
+ (iso7816_reset_retry_counter_kp): Remove.
+ (iso7816_reset_retry_counter_with_rc_kp): Remove.
+ (iso7816_change_reference_data_kp): Add an argument: IS_EXCHANGE.
+
+ * iso7816.c (iso7816_put_data_kp): Remove.
+ (iso7816_reset_retry_counter_kp): Remove.
+ (iso7816_reset_retry_counter_with_rc_kp): Remove.
+ (iso7816_change_reference_data_kp): Add an argument: IS_EXCHANGE.
+
+2011-12-01 Werner Koch <wk at gnupg.org>
+
+ Add hook to check the commit log syntax.
+ * autogen.sh: Install commit-msg hook for git.
+
+ Generate the ChangeLog from commit logs.
+ * scripts/gitlog-to-changelog: New script. Taken from gnulib.
+ * scripts/git-log-fix: New file.
+ * scripts/git-log-footer: New file.
+ * doc/HACKING: Describe the ChangeLog policy
+ * ChangeLog: New file.
+ * Makefile.am (EXTRA_DIST): Add new files.
+ (gen-ChangeLog): New.
+ (dist-hook): Run gen-ChangeLog.
+
+ Rename all ChangeLog files to ChangeLog-2011.
+
+2011-12-01 Werner Koch <wk at gnupg.org>
+
+ NB: Changes done before December 1st, 2011 are described in
+ per directory files named ChangeLog-2011. See doc/HACKING for
+ details.
+
+ -----
+ Copyright (C) 2011 Free Software Foundation, Inc.
+
+ Copying and distribution of this file and/or the original GIT
+ commit log messages, with or without modification, are
+ permitted provided the copyright notice and this notice are
+ preserved.
diff --cc VERSION
index 1b5105d,0000000..67da954
mode 100644,000000..100644
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,0 +1,1 @@@
- 2.1.14
++2.1.15
diff --cc common/status-codes.h
index 547f686,0000000..5cc0289
mode 100644,000000..100644
--- a/common/status-codes.h
+++ b/common/status-codes.h
@@@ -1,236 -1,0 +1,238 @@@
+/* Output of mkstrtable.awk. DO NOT EDIT. */
+
+/* status.h - Status codes
+ * Copyright (C) 2007 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of either
+ *
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* The purpose of this complex string table is to produce
+ optimal code with a minimum of relocations. */
+
+static const char statusstr_msgstr[] =
+ "ENTER" "\0"
+ "LEAVE" "\0"
+ "ABORT" "\0"
+ "GOODSIG" "\0"
+ "BADSIG" "\0"
+ "ERRSIG" "\0"
+ "BADARMOR" "\0"
+ "TRUST_UNDEFINED" "\0"
+ "TRUST_NEVER" "\0"
+ "TRUST_MARGINAL" "\0"
+ "TRUST_FULLY" "\0"
+ "TRUST_ULTIMATE" "\0"
+ "NEED_PASSPHRASE" "\0"
+ "VALIDSIG" "\0"
+ "SIG_ID" "\0"
+ "ENC_TO" "\0"
+ "NODATA" "\0"
+ "BAD_PASSPHRASE" "\0"
+ "NO_PUBKEY" "\0"
+ "NO_SECKEY" "\0"
+ "NEED_PASSPHRASE_SYM" "\0"
+ "DECRYPTION_INFO" "\0"
+ "DECRYPTION_FAILED" "\0"
+ "DECRYPTION_OKAY" "\0"
+ "MISSING_PASSPHRASE" "\0"
+ "GOOD_PASSPHRASE" "\0"
+ "GOODMDC" "\0"
+ "BADMDC" "\0"
+ "ERRMDC" "\0"
+ "IMPORTED" "\0"
+ "IMPORT_OK" "\0"
+ "IMPORT_PROBLEM" "\0"
+ "IMPORT_RES" "\0"
+ "IMPORT_CHECK" "\0"
+ "EXPORTED" "\0"
+ "EXPORT_RES" "\0"
+ "FILE_START" "\0"
+ "FILE_DONE" "\0"
+ "FILE_ERROR" "\0"
+ "BEGIN_DECRYPTION" "\0"
+ "END_DECRYPTION" "\0"
+ "BEGIN_ENCRYPTION" "\0"
+ "END_ENCRYPTION" "\0"
+ "BEGIN_SIGNING" "\0"
+ "DELETE_PROBLEM" "\0"
+ "GET_BOOL" "\0"
+ "GET_LINE" "\0"
+ "GET_HIDDEN" "\0"
+ "GOT_IT" "\0"
+ "PROGRESS" "\0"
+ "SIG_CREATED" "\0"
+ "SESSION_KEY" "\0"
+ "NOTATION_NAME" "\0"
+ "NOTATION_FLAGS" "\0"
+ "NOTATION_DATA" "\0"
+ "POLICY_URL" "\0"
+ "KEY_CREATED" "\0"
+ "USERID_HINT" "\0"
+ "UNEXPECTED" "\0"
+ "INV_RECP" "\0"
+ "INV_SGNR" "\0"
+ "NO_RECP" "\0"
+ "NO_SGNR" "\0"
+ "KEY_CONSIDERED" "\0"
+ "ALREADY_SIGNED" "\0"
+ "KEYEXPIRED" "\0"
+ "KEYREVOKED" "\0"
+ "EXPSIG" "\0"
+ "EXPKEYSIG" "\0"
+ "ATTRIBUTE" "\0"
+ "REVKEYSIG" "\0"
+ "NEWSIG" "\0"
+ "SIG_SUBPACKET" "\0"
+ "PLAINTEXT" "\0"
+ "PLAINTEXT_LENGTH" "\0"
+ "KEY_NOT_CREATED" "\0"
+ "NEED_PASSPHRASE_PIN" "\0"
+ "CARDCTRL" "\0"
+ "SC_OP_FAILURE" "\0"
+ "SC_OP_SUCCESS" "\0"
+ "BACKUP_KEY_CREATED" "\0"
+ "PKA_TRUST_BAD" "\0"
+ "PKA_TRUST_GOOD" "\0"
+ "TOFU_USER" "\0"
+ "TOFU_STATS" "\0"
+ "TOFU_STATS_SHORT" "\0"
+ "TOFU_STATS_LONG" "\0"
+ "TRUNCATED" "\0"
+ "MOUNTPOINT" "\0"
++ "BLOCKDEV" "\0"
+ "PINENTRY_LAUNCHED" "\0"
+ "PLAINTEXT_FOLLOWS" "\0"
+ "ERROR" "\0"
+ "WARNING" "\0"
+ "SUCCESS" "\0"
+ "FAILURE" "\0"
+ "INQUIRE_MAXLEN";
+
+static const int statusstr_msgidx[] =
+ {
+ 0,
+ 6,
+ 12,
+ 18,
+ 26,
+ 33,
+ 40,
+ 49,
+ 65,
+ 77,
+ 92,
+ 104,
+ 119,
+ 135,
+ 144,
+ 151,
+ 158,
+ 165,
+ 180,
+ 190,
+ 200,
+ 220,
+ 236,
+ 254,
+ 270,
+ 289,
+ 305,
+ 313,
+ 320,
+ 327,
+ 336,
+ 346,
+ 361,
+ 372,
+ 385,
+ 394,
+ 405,
+ 416,
+ 426,
+ 437,
+ 454,
+ 469,
+ 486,
+ 501,
+ 515,
+ 530,
+ 539,
+ 548,
+ 559,
+ 566,
+ 575,
+ 587,
+ 599,
+ 613,
+ 628,
+ 642,
+ 653,
+ 665,
+ 677,
+ 688,
+ 697,
+ 706,
+ 714,
+ 722,
+ 737,
+ 752,
+ 763,
+ 774,
+ 781,
+ 791,
+ 801,
+ 811,
+ 818,
+ 832,
+ 842,
+ 859,
+ 875,
+ 895,
+ 904,
+ 918,
+ 932,
+ 951,
+ 965,
+ 980,
+ 990,
+ 1001,
+ 1018,
+ 1034,
+ 1044,
+ 1055,
- 1073,
- 1091,
- 1097,
- 1105,
- 1113,
- 1121,
++ 1064,
++ 1082,
++ 1100,
++ 1106,
++ 1114,
++ 1122,
++ 1130,
+
+ };
+
+#define statusstr_msgidxof(code) (0 ? -1 \
- : ((code >= 0) && (code <= 95)) ? (code - 0) \
++ : ((code >= 0) && (code <= 96)) ? (code - 0) \
+ : -1)
diff --cc doc/defsincdate
index c4d69df,0000000..0d1789c
mode 100644,000000..100644
--- a/doc/defsincdate
+++ b/doc/defsincdate
@@@ -1,1 -1,0 +1,1 @@@
- 1468502376
++1471529749
diff --cc doc/gnupg.info
index 27fdb77,0000000..e94340f
mode 100644,000000..100644
--- a/doc/gnupg.info
+++ b/doc/gnupg.info
@@@ -1,214 -1,0 +1,215 @@@
+This is gnupg.info, produced by makeinfo version 5.2 from gnupg.texi.
+
- This is the 'The GNU Privacy Guard Manual' (version 2.1.14, July 2016).
++This is the 'The GNU Privacy Guard Manual' (version 2.1.15, August
++2016).
+
+ (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
+(C) 2013, 2014, 2015 Werner Koch.
+(C) 2015 g10 Code GmbH.
+
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 3 of the
+ License, or (at your option) any later version. The text of the
+ license can be found in the section entitled "Copying".
+INFO-DIR-SECTION GNU Utilities
+START-INFO-DIR-ENTRY
+* gpg2: (gnupg). OpenPGP encryption and signing tool.
+* gpgsm: (gnupg). S/MIME encryption and signing tool.
+* gpg-agent: (gnupg). The secret key daemon.
+* dirmngr: (gnupg). X.509 CRL and OCSP server.
+* dirmngr-client: (gnupg). X.509 CRL and OCSP client.
+END-INFO-DIR-ENTRY
+
+
+Indirect:
- gnupg.info-1: 969
- gnupg.info-2: 301435
++gnupg.info-1: 971
++gnupg.info-2: 301444
+
+Tag Table:
+(Indirect)
- Node: Top969
- Node: Installation2764
- Node: Invoking GPG-AGENT5113
- Node: Agent Commands6756
- Node: Agent Options7917
- Ref: option --options8074
- Ref: option --homedir8343
- Ref: option --log-file13269
- Ref: option --no-allow-mark-trusted13603
- Ref: option --allow-preset-passphrase13807
- Ref: option --no-allow-loopback-pinentry13960
- Ref: option --extra-socket21033
- Ref: option --enable-ssh-support21517
- Node: Agent Configuration23869
- Node: Agent Signals29271
- Node: Agent Examples30720
- Node: Agent Protocol31287
- Node: Agent PKDECRYPT33441
- Node: Agent PKSIGN35354
- Node: Agent GENKEY37655
- Node: Agent IMPORT39554
- Node: Agent EXPORT39996
- Node: Agent ISTRUSTED40211
- Node: Agent GET_PASSPHRASE42585
- Node: Agent CLEAR_PASSPHRASE45026
- Node: Agent PRESET_PASSPHRASE45417
- Node: Agent GET_CONFIRMATION46255
- Node: Agent HAVEKEY46927
- Node: Agent LEARN47559
- Node: Agent PASSWD47854
- Node: Agent UPDATESTARTUPTTY48320
- Node: Agent GETEVENTCOUNTER48798
- Node: Agent GETINFO49604
- Node: Agent OPTION50308
- Node: Invoking DIRMNGR52669
- Node: Dirmngr Commands53763
- Node: Dirmngr Options55874
- Ref: Dirmngr Options-Footnote-167640
- Node: Dirmngr Configuration67774
- Node: Dirmngr Signals70987
- Node: Dirmngr Examples72018
- Node: Dirmngr Protocol72700
- Node: Dirmngr LOOKUP73350
- Node: Dirmngr ISVALID74721
- Node: Dirmngr CHECKCRL77291
- Node: Dirmngr CHECKOCSP78347
- Node: Dirmngr CACHECERT79652
- Node: Dirmngr VALIDATE80490
- Node: Invoking GPG81058
- Node: GPG Commands82051
- Node: General GPG Commands82881
- Node: Operational GPG Commands83512
- Ref: option --export-ownertrust98548
- Node: OpenPGP Key Management100648
- Node: GPG Options118520
- Node: GPG Configuration Options119851
- Ref: gpg-option --options132249
- Ref: trust-model-tofu136679
- Node: GPG Key related Options155566
- Node: GPG Input and Output160329
- Node: OpenPGP Options169247
- Node: Compliance Options173716
- Node: GPG Esoteric Options176420
- Ref: GPG Esoteric Options-Footnote-1199927
- Node: Deprecated Options200081
- Node: GPG Configuration201549
- Node: GPG Examples205500
- Node: Unattended Usage of GPG212534
- Node: Unattended GPG key generation212973
- Node: Invoking GPGSM221689
- Node: GPGSM Commands222558
- Node: General GPGSM Commands222996
- Node: Operational GPGSM Commands223684
- Node: Certificate Management225718
- Node: GPGSM Options230656
- Node: Configuration Options231230
- Ref: gpgsm-option --options231499
- Node: Certificate Options234477
- Ref: gpgsm-option --validation-model237384
- Node: Input and Output238364
- Ref: option --p12-charset238947
- Ref: gpgsm-option --with-key-data240191
- Ref: gpgsm-option --with-validation240439
- Node: CMS Options241311
- Node: Esoteric Options242333
- Node: GPGSM Configuration247349
- Node: GPGSM Examples253014
- Node: Unattended Usage253211
- Node: Automated signature checking253802
- Node: CSR and certificate creation255633
- Node: GPGSM Protocol260573
- Node: GPGSM ENCRYPT261831
- Node: GPGSM DECRYPT264501
- Node: GPGSM SIGN265337
- Node: GPGSM VERIFY266784
- Node: GPGSM GENKEY267299
- Node: GPGSM LISTKEYS268314
- Ref: gpgsm-cmd listkeys268473
- Node: GPGSM EXPORT269235
- Node: GPGSM IMPORT270193
- Node: GPGSM DELETE270934
- Node: GPGSM GETAUDITLOG271441
- Ref: gpgsm-cmd getauditlog271612
- Node: GPGSM GETINFO271953
- Node: GPGSM OPTION272802
- Node: Invoking SCDAEMON276149
- Node: Scdaemon Commands276823
- Node: Scdaemon Options277943
- Node: Card applications286794
- Node: OpenPGP Card287459
- Node: NKS Card287932
- Node: DINSIG Card288258
- Node: PKCS#15 Card288634
- Node: Geldkarte Card288904
- Node: SmartCard-HSM289295
- Node: Undefined Card289890
- Node: Scdaemon Configuration290303
- Node: Scdaemon Examples291341
- Node: Scdaemon Protocol291524
- Node: Scdaemon SERIALNO293042
- Node: Scdaemon LEARN293972
- Node: Scdaemon READCERT294828
- Node: Scdaemon READKEY295229
- Node: Scdaemon PKSIGN295515
- Node: Scdaemon PKDECRYPT296241
- Node: Scdaemon GETATTR296990
- Node: Scdaemon SETATTR297194
- Node: Scdaemon WRITEKEY297401
- Node: Scdaemon GENKEY298105
- Node: Scdaemon RANDOM298310
- Node: Scdaemon PASSWD298533
- Node: Scdaemon CHECKPIN298926
- Node: Scdaemon RESTART299931
- Node: Scdaemon APDU301435
- Node: Specify a User ID302410
- Ref: how-to-specify-a-user-id302568
- Node: Helper Tools307457
- Node: watchgnupg308293
- Ref: option watchgnupg --tcp309021
- Node: gpgv310351
- Node: addgnupghome314779
- Node: gpgconf315477
- Ref: gpgconf-Footnote-1317613
- Node: Invoking gpgconf317911
- Node: Format conventions321784
- Node: Listing components327115
- Node: Checking programs329206
- Node: Listing options331953
- Node: Changing options339457
- Node: Listing global options341159
- Node: Files used by gpgconf342935
- Node: applygnupgdefaults343281
++Node: Top971
++Node: Installation2768
++Node: Invoking GPG-AGENT5117
++Node: Agent Commands6760
++Node: Agent Options7921
++Ref: option --options8078
++Ref: option --homedir8347
++Ref: option --log-file13273
++Ref: option --no-allow-mark-trusted13607
++Ref: option --allow-preset-passphrase13811
++Ref: option --no-allow-loopback-pinentry13964
++Ref: option --extra-socket21037
++Ref: option --enable-ssh-support21525
++Node: Agent Configuration23877
++Node: Agent Signals29284
++Node: Agent Examples30733
++Node: Agent Protocol31300
++Node: Agent PKDECRYPT33454
++Node: Agent PKSIGN35367
++Node: Agent GENKEY37668
++Node: Agent IMPORT39565
++Node: Agent EXPORT40007
++Node: Agent ISTRUSTED40222
++Node: Agent GET_PASSPHRASE42596
++Node: Agent CLEAR_PASSPHRASE45037
++Node: Agent PRESET_PASSPHRASE45428
++Node: Agent GET_CONFIRMATION46266
++Node: Agent HAVEKEY46938
++Node: Agent LEARN47570
++Node: Agent PASSWD47865
++Node: Agent UPDATESTARTUPTTY48331
++Node: Agent GETEVENTCOUNTER48809
++Node: Agent GETINFO49615
++Node: Agent OPTION50319
++Node: Invoking DIRMNGR52680
++Node: Dirmngr Commands53578
++Node: Dirmngr Options55689
++Ref: Dirmngr Options-Footnote-167454
++Node: Dirmngr Configuration67589
++Node: Dirmngr Signals70187
++Node: Dirmngr Examples71218
++Node: Dirmngr Protocol71900
++Node: Dirmngr LOOKUP72550
++Node: Dirmngr ISVALID73921
++Node: Dirmngr CHECKCRL76491
++Node: Dirmngr CHECKOCSP77547
++Node: Dirmngr CACHECERT78852
++Node: Dirmngr VALIDATE79690
++Node: Invoking GPG80258
++Node: GPG Commands81251
++Node: General GPG Commands82081
++Node: Operational GPG Commands82712
++Ref: option --export-ownertrust97827
++Node: OpenPGP Key Management99927
++Node: GPG Options117799
++Node: GPG Configuration Options119130
++Ref: gpg-option --options131528
++Ref: trust-model-tofu135958
++Node: GPG Key related Options154014
++Node: GPG Input and Output159214
++Node: OpenPGP Options169235
++Node: Compliance Options173704
++Node: GPG Esoteric Options176408
++Ref: GPG Esoteric Options-Footnote-1199915
++Node: Deprecated Options200069
++Node: GPG Configuration201537
++Node: GPG Examples205488
++Node: Unattended Usage of GPG212522
++Node: Unattended GPG key generation212961
++Node: Invoking GPGSM221677
++Node: GPGSM Commands222546
++Node: General GPGSM Commands222984
++Node: Operational GPGSM Commands223672
++Node: Certificate Management225706
++Node: GPGSM Options230644
++Node: Configuration Options231218
++Ref: gpgsm-option --options231487
++Node: Certificate Options234465
++Ref: gpgsm-option --validation-model237372
++Node: Input and Output238352
++Ref: option --p12-charset238935
++Ref: gpgsm-option --with-key-data240179
++Ref: gpgsm-option --with-validation240427
++Node: CMS Options241299
++Node: Esoteric Options242321
++Node: GPGSM Configuration247343
++Node: GPGSM Examples253008
++Node: Unattended Usage253205
++Node: Automated signature checking253796
++Node: CSR and certificate creation255627
++Node: GPGSM Protocol260567
++Node: GPGSM ENCRYPT261825
++Node: GPGSM DECRYPT264495
++Node: GPGSM SIGN265331
++Node: GPGSM VERIFY266778
++Node: GPGSM GENKEY267293
++Node: GPGSM LISTKEYS268308
++Ref: gpgsm-cmd listkeys268467
++Node: GPGSM EXPORT269229
++Node: GPGSM IMPORT270187
++Node: GPGSM DELETE270928
++Node: GPGSM GETAUDITLOG271435
++Ref: gpgsm-cmd getauditlog271606
++Node: GPGSM GETINFO271948
++Node: GPGSM OPTION272797
++Node: Invoking SCDAEMON276144
++Node: Scdaemon Commands276818
++Node: Scdaemon Options277938
++Node: Card applications286801
++Node: OpenPGP Card287466
++Node: NKS Card287939
++Node: DINSIG Card288265
++Node: PKCS#15 Card288641
++Node: Geldkarte Card288911
++Node: SmartCard-HSM289302
++Node: Undefined Card289897
++Node: Scdaemon Configuration290310
++Node: Scdaemon Examples291348
++Node: Scdaemon Protocol291531
++Node: Scdaemon SERIALNO293049
++Node: Scdaemon LEARN293979
++Node: Scdaemon READCERT294835
++Node: Scdaemon READKEY295236
++Node: Scdaemon PKSIGN295522
++Node: Scdaemon PKDECRYPT296248
++Node: Scdaemon GETATTR296997
++Node: Scdaemon SETATTR297201
++Node: Scdaemon WRITEKEY297408
++Node: Scdaemon GENKEY298112
++Node: Scdaemon RANDOM298317
++Node: Scdaemon PASSWD298540
++Node: Scdaemon CHECKPIN298933
++Node: Scdaemon RESTART299938
++Node: Scdaemon APDU301444
++Node: Specify a User ID302419
++Ref: how-to-specify-a-user-id302577
++Node: Helper Tools307466
++Node: watchgnupg308302
++Ref: option watchgnupg --tcp309030
++Node: gpgv310360
++Node: addgnupghome314788
++Node: gpgconf315486
++Ref: gpgconf-Footnote-1317612
++Node: Invoking gpgconf317910
++Node: Format conventions321783
++Node: Listing components327114
++Node: Checking programs329205
++Node: Listing options331952
++Node: Changing options339456
++Node: Listing global options341158
++Node: Files used by gpgconf342934
++Node: applygnupgdefaults343280
+Node: gpg-preset-passphrase344026
+Node: Invoking gpg-preset-passphrase344987
+Node: gpg-connect-agent346257
+Node: Invoking gpg-connect-agent346972
+Node: Controlling gpg-connect-agent350519
+Node: dirmngr-client356992
+Node: gpgparsemail360342
+Node: symcryptrun360660
+Node: Invoking symcryptrun361559
- Node: gpg-zip364071
- Node: Howtos365897
- Node: Howto Create a Server Cert366164
- Node: System Notes374595
- Node: W32 Notes375808
- Node: Debugging376230
- Node: Debugging Tools377059
- Node: kbxutil377339
- Ref: kbxutil-Footnote-1378910
- Node: Debugging Hints379006
- Node: Common Problems380143
- Node: Architecture Details385369
- Node: Component interaction385681
- Ref: fig:moduleoverview385869
- Node: GnuPG-1 and GnuPG-2385976
- Ref: fig:cardarchitecture386268
- Node: Copying386383
- Node: Contributors423903
- Node: Glossary430144
- Node: Option Index432662
- Node: Environment Index503541
- Node: Index509113
++Node: gpg-zip364072
++Node: Howtos365898
++Node: Howto Create a Server Cert366165
++Node: System Notes374596
++Node: W32 Notes375809
++Node: Debugging376231
++Node: Debugging Tools377060
++Node: kbxutil377340
++Ref: kbxutil-Footnote-1378911
++Node: Debugging Hints379007
++Node: Common Problems380144
++Node: Architecture Details385370
++Node: Component interaction385682
++Ref: fig:moduleoverview385870
++Node: GnuPG-1 and GnuPG-2385977
++Ref: fig:cardarchitecture386269
++Node: Copying386384
++Node: Contributors423904
++Node: Glossary430145
++Node: Option Index432663
++Node: Environment Index503676
++Node: Index509248
+
+End Tag Table
diff --cc doc/gnupg.info-1
index c2748c1,0000000..7070ca9
mode 100644,000000..100644
--- a/doc/gnupg.info-1
+++ b/doc/gnupg.info-1
@@@ -1,7369 -1,0 +1,7373 @@@
+This is gnupg.info, produced by makeinfo version 5.2 from gnupg.texi.
+
- This is the 'The GNU Privacy Guard Manual' (version 2.1.14, July 2016).
++This is the 'The GNU Privacy Guard Manual' (version 2.1.15, August
++2016).
+
+ (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
+(C) 2013, 2014, 2015 Werner Koch.
+(C) 2015 g10 Code GmbH.
+
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 3 of the
+ License, or (at your option) any later version. The text of the
+ license can be found in the section entitled "Copying".
+INFO-DIR-SECTION GNU Utilities
+START-INFO-DIR-ENTRY
+* gpg2: (gnupg). OpenPGP encryption and signing tool.
+* gpgsm: (gnupg). S/MIME encryption and signing tool.
+* gpg-agent: (gnupg). The secret key daemon.
+* dirmngr: (gnupg). X.509 CRL and OCSP server.
+* dirmngr-client: (gnupg). X.509 CRL and OCSP client.
+END-INFO-DIR-ENTRY
+
+
+File: gnupg.info, Node: Top, Next: Installation, Up: (dir)
+
+Using the GNU Privacy Guard
+***************************
+
- This is the 'The GNU Privacy Guard Manual' (version 2.1.14, July 2016).
++This is the 'The GNU Privacy Guard Manual' (version 2.1.15, August
++2016).
+
+ (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
+(C) 2013, 2014, 2015 Werner Koch.
+(C) 2015 g10 Code GmbH.
+
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 3 of the
+ License, or (at your option) any later version. The text of the
+ license can be found in the section entitled "Copying".
+
+ This manual documents how to use the GNU Privacy Guard system as well
+as the administration and the architecture.
+
+* Menu:
+
+* Installation:: A short installation guide.
+
+* Invoking GPG-AGENT:: How to launch the secret key daemon.
+* Invoking DIRMNGR:: How to launch the CRL and OCSP daemon.
+* Invoking GPG:: Using the OpenPGP protocol.
+* Invoking GPGSM:: Using the S/MIME protocol.
+* Invoking SCDAEMON:: How to handle Smartcards.
+* Specify a User ID:: How to Specify a User Id.
+
+* Helper Tools:: Description of small helper tools
+
+* Howtos:: How to do certain things.
+* System Notes:: Notes pertaining to certain OSes.
+* Debugging:: How to solve problems
+
+* Copying:: GNU General Public License says
+ how you can copy and share GnuPG
+* Contributors:: People who have contributed to GnuPG.
+
+* Glossary:: Short description of terms used.
+* Option Index:: Index to command line options.
+* Environment Index:: Index to environment variables and files.
+* Index:: Index of concepts and symbol names.
+
+
+File: gnupg.info, Node: Installation, Next: Invoking GPG-AGENT, Prev: Top, Up: Top
+
+1 A short installation guide.
+*****************************
+
+Unfortunately the installation guide has not been finished in time.
+Instead of delaying the release of GnuPG 2.0 even further, I decided to
+release without that guide. The chapter on gpg-agent and gpgsm do
+include brief information on how to set up the whole thing. Please
+watch the GnuPG website for updates of the documentation. In the
+meantime you may search the GnuPG mailing list archives or ask on the
+gnupg-users mailing listsfor advise on how to solve problems or how to
+get that whole thing up and running.
+
+ ** Building the software
+
+ Building the software is decribed in the file 'INSTALL'. Given that
+you are already reading this documentation we can only give some extra
+hints
+
+ To comply with the rules on GNU systems you should have build time
+configured 'gnupg' using:
+
+ ./configure --sysconfdir=/etc --localstatedir=/var
+
+ This is to make sure that system wide configuration files are
+searched in the directory '/etc' and variable data below '/var'; the
+default would be to also install them below '/usr/local' where the
+binaries get installed. If you selected to use the '--prefix=/' you
+obviously don't need those option as they are the default then.
+
+ ** Notes on setting a root CA key to trusted
+
+ X.509 is based on a hierarchical key infrastructure. At the root of
+the tree a trusted anchor (root certificate) is required. There are
+usually no other means of verifying whether this root certificate is
+trustworthy than looking it up in a list. GnuPG uses a file
+('trustlist.txt') to keep track of all root certificates it knows about.
+There are 3 ways to get certificates into this list:
+
+ * Use the list which comes with GnuPG. However this list only
+ contains a few root certificates. Most installations will need
+ more.
+
+ * Let 'gpgsm' ask you whether you want to insert a new root
+ certificate. This feature is enabled by default; you may disable
+ it using the option 'no-allow-mark-trusted' into 'gpg-agent.conf'.
+
+ * Manually maintain the list of trusted root certificates. For a
+ multi user installation this can be done once for all users on a
+ machine. Specific changes on a per-user base are also possible.
+
+
+File: gnupg.info, Node: Invoking GPG-AGENT, Next: Invoking DIRMNGR, Prev: Installation, Up: Top
+
+2 Invoking GPG-AGENT
+********************
+
+'gpg-agent' is a daemon to manage secret (private) keys independently
+from any protocol. It is used as a backend for 'gpg' and 'gpgsm' as
+well as for a couple of other utilities.
+
+ The agent is automatically started on demand by 'gpg', 'gpgsm',
+'gpgconf', or 'gpg-connect-agent'. Thus there is no reason to start it
+manually. In case you want to use the included Secure Shell Agent you
+may start the agent using:
+
+ gpg-connect-agent /bye
+
+You should always add the following lines to your '.bashrc' or whatever
+initialization file is used for all shell invocations:
+
+ GPG_TTY=$(tty)
+ export GPG_TTY
+
+It is important that this environment variable always reflects the
+output of the 'tty' command. For W32 systems this option is not
+required.
+
+ Please make sure that a proper pinentry program has been installed
+under the default filename (which is system dependent) or use the option
+'pinentry-program' to specify the full name of that program. It is
+often useful to install a symbolic link from the actual used pinentry
+(e.g. '/usr/local/bin/pinentry-gtk') to the expected one (e.g.
+'/usr/local/bin/pinentry').
+
+*Note Option Index::,for an index to 'GPG-AGENT''s commands and options.
+
+* Menu:
+
+* Agent Commands:: List of all commands.
+* Agent Options:: List of all options.
+* Agent Configuration:: Configuration files.
+* Agent Signals:: Use of some signals.
+* Agent Examples:: Some usage examples.
+* Agent Protocol:: The protocol the agent uses.
+
+
+File: gnupg.info, Node: Agent Commands, Next: Agent Options, Up: Invoking GPG-AGENT
+
+2.1 Commands
+============
+
+Commands are not distinguished from options except for the fact that
+only one command is allowed.
+
+'--version'
+ Print the program version and licensing information. Note that you
+ cannot abbreviate this command.
+
+'--help'
+'-h'
+ Print a usage message summarizing the most useful command-line
+ options. Note that you cannot abbreviate this command.
+
+'--dump-options'
+ Print a list of all available options and commands. Note that you
+ cannot abbreviate this command.
+
+'--server'
+ Run in server mode and wait for commands on the 'stdin'. The
+ default mode is to create a socket and listen for commands there.
+
+'--daemon [COMMAND LINE]'
+ Start the gpg-agent as a daemon; that is, detach it from the
+ console and run it in the background.
+
+ As an alternative you may create a new process as a child of
+ gpg-agent: 'gpg-agent --daemon /bin/sh'. This way you get a new
+ shell with the environment setup properly; after you exit from this
+ shell, gpg-agent terminates within a few seconds.
+
+
+File: gnupg.info, Node: Agent Options, Next: Agent Configuration, Prev: Agent Commands, Up: Invoking GPG-AGENT
+
+2.2 Option Summary
+==================
+
+'--options FILE'
+ Reads configuration from FILE instead of from the default per-user
+ configuration file. The default configuration file is named
+ 'gpg-agent.conf' and expected in the '.gnupg' directory directly
+ below the home directory of the user.
+
+'--homedir DIR'
+ Set the name of the home directory to DIR. If this option is not
+ used, the home directory defaults to '~/.gnupg'. It is only
+ recognized when given on the command line. It also overrides any
+ home directory stated through the environment variable 'GNUPGHOME'
+ or (on Windows systems) by means of the Registry entry
+ HKCU\SOFTWARE\GNU\GNUPG:HOMEDIR.
+
+ On Windows systems it is possible to install GnuPG as a portable
+ application. In this case only this command line option is
+ considered, all other ways to set a home directory are ignored.
+
+ To install GnuPG as a portable application under Windows, create an
+ empty file name 'gpgconf.ctl' in the same directory as the tool
+ 'gpgconf.exe'. The root of the installation is than that
+ directory; or, if 'gpgconf.exe' has been installed directly below a
+ directory named 'bin', its parent directory. You also need to make
+ sure that the following directories exist and are writable:
+ 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ for internal cache files.
+
+'-v'
+'--verbose'
+ Outputs additional information while running. You can increase the
+ verbosity by giving several verbose commands to 'gpgsm', such as
+ '-vv'.
+
+'-q'
+'--quiet'
+ Try to be as quiet as possible.
+
+'--batch'
+ Don't invoke a pinentry or do any other thing requiring human
+ interaction.
+
+'--faked-system-time EPOCH'
+ This option is only useful for testing; it sets the system time
+ back or forth to EPOCH which is the number of seconds elapsed since
+ the year 1970.
+
+'--debug-level LEVEL'
+ Select the debug level for investigating problems. LEVEL may be a
+ numeric value or a keyword:
+
+ 'none'
+ No debugging at all. A value of less than 1 may be used
+ instead of the keyword.
+ 'basic'
+ Some basic debug messages. A value between 1 and 2 may be
+ used instead of the keyword.
+ 'advanced'
+ More verbose debug messages. A value between 3 and 5 may be
+ used instead of the keyword.
+ 'expert'
+ Even more detailed messages. A value between 6 and 8 may be
+ used instead of the keyword.
+ 'guru'
+ All of the debug messages you can get. A value greater than 8
+ may be used instead of the keyword. The creation of hash
+ tracing files is only enabled if the keyword is used.
+
+ How these messages are mapped to the actual debugging flags is not
+ specified and may change with newer releases of this program. They
+ are however carefully selected to best aid in debugging.
+
+'--debug FLAGS'
+ This option is only useful for debugging and the behaviour may
+ change at any time without notice. FLAGS are bit encoded and may
+ be given in usual C-Syntax. The currently defined bits are:
+
+ '0 (1)'
+ X.509 or OpenPGP protocol related data
+ '1 (2)'
+ values of big number integers
+ '2 (4)'
+ low level crypto operations
+ '5 (32)'
+ memory allocation
+ '6 (64)'
+ caching
+ '7 (128)'
+ show memory statistics.
+ '9 (512)'
+ write hashed data to files named 'dbgmd-000*'
+ '10 (1024)'
+ trace Assuan protocol
+ '12 (4096)'
+ bypass all certificate validation
+
+'--debug-all'
+ Same as '--debug=0xffffffff'
+
+'--debug-wait N'
+ When running in server mode, wait N seconds before entering the
+ actual processing loop and print the pid. This gives time to
+ attach a debugger.
+
+'--debug-quick-random'
+ This option inhibits the use of the very secure random quality
+ level (Libgcrypt’s 'GCRY_VERY_STRONG_RANDOM') and degrades all
+ request down to standard random quality. It is only used for
+ testing and should not be used for any production quality keys.
+ This option is only effective when given on the command line.
+
+ On GNU/Linux, another way to quickly generate insecure keys is to
+ use 'rngd' to fill the kernel's entropy pool with lower quality
+ random data. 'rngd' is typically provided by the 'rng-tools'
+ package. It can be run as follows: 'sudo rngd -f -r /dev/urandom'.
+
+'--debug-pinentry'
+ This option enables extra debug information pertaining to the
+ Pinentry. As of now it is only useful when used along with
+ '--debug 1024'.
+
+'--no-detach'
+ Don't detach the process from the console. This is mainly useful
+ for debugging.
+
+'-s'
+'--sh'
+'-c'
+'--csh'
+ Format the info output in daemon mode for use with the standard
+ Bourne shell or the C-shell respectively. The default is to guess
+ it based on the environment variable 'SHELL' which is correct in
+ almost all cases.
+
+'--no-grab'
+ Tell the pinentry not to grab the keyboard and mouse. This option
+ should in general not be used to avoid X-sniffing attacks.
+
+'--log-file FILE'
+ Append all logging output to FILE. This is very helpful in seeing
+ what the agent actually does. If neither a log file nor a log file
+ descriptor has been set on a Windows platform, the Registry entry
+ 'HKCU\Software\GNU\GnuPG:DefaultLogFile', if set, is used to
+ specify the logging output.
+
+'--no-allow-mark-trusted'
+ Do not allow clients to mark keys as trusted, i.e. put them into
+ the 'trustlist.txt' file. This makes it harder for users to
+ inadvertently accept Root-CA keys.
+
+'--allow-preset-passphrase'
+ This option allows the use of 'gpg-preset-passphrase' to seed the
+ internal cache of 'gpg-agent' with passphrases.
+
+'--no-allow-loopback-pinentry'
+'--allow-loopback-pinentry'
+ Disallow or allow clients to use the loopback pinentry features;
+ see the option 'pinentry-mode' for details. Allow is the default.
+
+ The '--force' option of the Assuan command 'DELETE_KEY' is also
+ controlled by this option: The option is ignored if a loopback
+ pinentry is disallowed.
+
+'--no-allow-external-cache'
+ Tell Pinentry not to enable features which use an external cache
+ for passphrases.
+
+ Some desktop environments prefer to unlock all credentials with one
+ master password and may have installed a Pinentry which employs an
+ additional external cache to implement such a policy. By using
+ this option the Pinentry is advised not to make use of such a cache
+ and instead always ask the user for the requested passphrase.
+
+'--allow-emacs-pinentry'
+ Tell Pinentry to allow features to divert the passphrase entry to a
+ running Emacs instance. How this is exactly handled depends on the
+ version of the used Pinentry.
+
+'--ignore-cache-for-signing'
+ This option will let 'gpg-agent' bypass the passphrase cache for
+ all signing operation. Note that there is also a per-session
+ option to control this behaviour but this command line option takes
+ precedence.
+
+'--default-cache-ttl N'
+ Set the time a cache entry is valid to N seconds. The default is
+ 600 seconds. Each time a cache entry is accessed, the entry's
+ timer is reset. To set an entry's maximum lifetime, use
+ 'max-cache-ttl'.
+
+'--default-cache-ttl-ssh N'
+ Set the time a cache entry used for SSH keys is valid to N seconds.
+ The default is 1800 seconds. Each time a cache entry is accessed,
+ the entry's timer is reset. To set an entry's maximum lifetime,
+ use 'max-cache-ttl-ssh'.
+
+'--max-cache-ttl N'
+ Set the maximum time a cache entry is valid to N seconds. After
+ this time a cache entry will be expired even if it has been
+ accessed recently or has been set using 'gpg-preset-passphrase'.
+ The default is 2 hours (7200 seconds).
+
+'--max-cache-ttl-ssh N'
+ Set the maximum time a cache entry used for SSH keys is valid to N
+ seconds. After this time a cache entry will be expired even if it
+ has been accessed recently or has been set using
+ 'gpg-preset-passphrase'. The default is 2 hours (7200 seconds).
+
+'--enforce-passphrase-constraints'
+ Enforce the passphrase constraints by not allowing the user to
+ bypass them using the "Take it anyway" button.
+
+'--min-passphrase-len N'
+ Set the minimal length of a passphrase. When entering a new
+ passphrase shorter than this value a warning will be displayed.
+ Defaults to 8.
+
+'--min-passphrase-nonalpha N'
+ Set the minimal number of digits or special characters required in
+ a passphrase. When entering a new passphrase with less than this
+ number of digits or special characters a warning will be displayed.
+ Defaults to 1.
+
+'--check-passphrase-pattern FILE'
+ Check the passphrase against the pattern given in FILE. When
+ entering a new passphrase matching one of these pattern a warning
+ will be displayed. FILE should be an absolute filename. The
+ default is not to use any pattern file.
+
+ Security note: It is known that checking a passphrase against a
+ list of pattern or even against a complete dictionary is not very
+ effective to enforce good passphrases. Users will soon figure up
+ ways to bypass such a policy. A better policy is to educate users
+ on good security behavior and optionally to run a passphrase
+ cracker regularly on all users passphrases to catch the very simple
+ ones.
+
+'--max-passphrase-days N'
+ Ask the user to change the passphrase if N days have passed since
+ the last change. With '--enforce-passphrase-constraints' set the
+ user may not bypass this check.
+
+'--enable-passphrase-history'
+ This option does nothing yet.
+
+'--pinentry-invisible-char CHAR'
+ This option asks the Pinentry to use CHAR for displaying hidden
+ characters. CHAR must be one character UTF-8 string. A Pinentry
+ may or may not honor this request.
+
+'--pinentry-timeout N'
+ This option asks the Pinentry to timeout after N seconds with no
+ user input. The default value of 0 does not ask the pinentry to
+ timeout, however a Pinentry may use its own default timeout value
+ in this case. A Pinentry may or may not honor this request.
+
+'--pinentry-program FILENAME'
+ Use program FILENAME as the PIN entry. The default is installation
+ dependent. With the default configuration the name of the default
+ pinentry is 'pinentry'; if that file does not exist but a
+ 'pinentry-basic' exist the latter is used.
+
+ On a Windows platform the default is to use the first existing
+ program from this list: 'bin\pinentry.exe',
+ '..\Gpg4win\bin\pinentry.exe', '..\Gpg4win\pinentry.exe',
+ '..\GNU\GnuPG\pinentry.exe', '..\GNU\bin\pinentry.exe',
+ 'bin\pinentry-basic.exe' where the file names are relative to the
+ GnuPG installation directory.
+
+'--pinentry-touch-file FILENAME'
+ By default the filename of the socket gpg-agent is listening for
+ requests is passed to Pinentry, so that it can touch that file
+ before exiting (it does this only in curses mode). This option
+ changes the file passed to Pinentry to FILENAME. The special name
+ '/dev/null' may be used to completely disable this feature. Note
+ that Pinentry will not create that file, it will only change the
+ modification and access time.
+
+'--scdaemon-program FILENAME'
+ Use program FILENAME as the Smartcard daemon. The default is
+ installation dependent and can be shown with the 'gpgconf' command.
+
+'--disable-scdaemon'
+ Do not make use of the scdaemon tool. This option has the effect
+ of disabling the ability to do smartcard operations. Note, that
+ enabling this option at runtime does not kill an already forked
+ scdaemon.
+
+'--disable-check-own-socket'
+ 'gpg-agent' employs a periodic self-test to detect a stolen socket.
+ This usually means a second instance of 'gpg-agent' has taken over
+ the socket and 'gpg-agent' will then terminate itself. This option
+ may be used to disable this self-test for debugging purposes.
+
+'--use-standard-socket'
+'--no-use-standard-socket'
+'--use-standard-socket-p'
+ Since GnuPG 2.1 the standard socket is always used. These options
+ have no more effect. The command 'gpg-agent
+ --use-standard-socket-p' will thus always return success.
+
+'--display STRING'
+'--ttyname STRING'
+'--ttytype STRING'
+'--lc-ctype STRING'
+'--lc-messages STRING'
+'--xauthority STRING'
+ These options are used with the server mode to pass localization
+ information.
+
+'--keep-tty'
+'--keep-display'
+ Ignore requests to change the current 'tty' or X window system's
+ 'DISPLAY' variable respectively. This is useful to lock the
+ pinentry to pop up at the 'tty' or display you started the agent.
+
+'--extra-socket NAME'
+ Also listen on native gpg-agent connections on the given socket.
+ The intended use for this extra socket is to setup a Unix domain
+ socket forwarding from a remote machine to this socket on the local
+ machine. A 'gpg' running on the remote machine may then connect to
- the local gpg-agent and use its private keys. This allows to
- decrypt or sign data on a remote machine without exposing the
++ the local gpg-agent and use its private keys. This enables
++ decrypting or signing data on a remote machine without exposing the
+ private keys to the remote machine.
+
+'--enable-ssh-support'
+'--enable-putty-support'
+
+ Enable the OpenSSH Agent protocol.
+
+ In this mode of operation, the agent does not only implement the
+ gpg-agent protocol, but also the agent protocol used by OpenSSH
+ (through a separate socket). Consequently, it should be possible
+ to use the gpg-agent as a drop-in replacement for the well known
+ ssh-agent.
+
+ SSH Keys, which are to be used through the agent, need to be added
+ to the gpg-agent initially through the ssh-add utility. When a key
+ is added, ssh-add will ask for the password of the provided key
+ file and send the unprotected key material to the agent; this
+ causes the gpg-agent to ask for a passphrase, which is to be used
+ for encrypting the newly received key and storing it in a gpg-agent
+ specific directory.
+
+ Once a key has been added to the gpg-agent this way, the gpg-agent
+ will be ready to use the key.
+
+ Note: in case the gpg-agent receives a signature request, the user
+ might need to be prompted for a passphrase, which is necessary for
+ decrypting the stored key. Since the ssh-agent protocol does not
+ contain a mechanism for telling the agent on which display/terminal
+ it is running, gpg-agent's ssh-support will use the TTY or X
+ display where gpg-agent has been started. To switch this display
+ to the current one, the following command may be used:
+
+ gpg-connect-agent updatestartuptty /bye
+
+ Although all GnuPG components try to start the gpg-agent as needed,
+ this is not possible for the ssh support because ssh does not know
+ about it. Thus if no GnuPG tool which accesses the agent has been
+ run, there is no guarantee that ssh is able to use gpg-agent for
+ authentication. To fix this you may start gpg-agent if needed
+ using this simple command:
+
+ gpg-connect-agent /bye
+
+ Adding the '--verbose' shows the progress of starting the agent.
+
+ The '--enable-putty-support' is only available under Windows and
+ allows the use of gpg-agent with the ssh implementation 'putty'.
+ This is similar to the regular ssh-agent support but makes use of
+ Windows message queue as required by 'putty'.
+
+ All the long options may also be given in the configuration file
+after stripping off the two leading dashes.
+
+
+File: gnupg.info, Node: Agent Configuration, Next: Agent Signals, Prev: Agent Options, Up: Invoking GPG-AGENT
+
+2.3 Configuration
+=================
+
+There are a few configuration files needed for the operation of the
+agent. By default they may all be found in the current home directory
+(*note option --homedir::).
+
+'gpg-agent.conf'
+ This is the standard configuration file read by 'gpg-agent' on
+ startup. It may contain any valid long option; the leading two
+ dashes may not be entered and the option may not be abbreviated.
+ This file is also read after a 'SIGHUP' however only a few options
+ will actually have an effect. This default name may be changed on
+ the command line (*note option --options::). You should backup
+ this file.
+
+'trustlist.txt'
+ This is the list of trusted keys. You should backup this file.
+
+ Comment lines, indicated by a leading hash mark, as well as empty
+ lines are ignored. To mark a key as trusted you need to enter its
+ fingerprint followed by a space and a capital letter 'S'. Colons
+ may optionally be used to separate the bytes of a fingerprint; this
- allows to cut and paste the fingerprint from a key listing output.
- If the line is prefixed with a '!' the key is explicitly marked as
- not trusted.
++ enables cutting and pasting the fingerprint from a key listing
++ output. If the line is prefixed with a '!' the key is explicitly
++ marked as not trusted.
+
+ Here is an example where two keys are marked as ultimately trusted
+ and one as not trusted:
+
+ # CN=Wurzel ZS 3,O=Intevation GmbH,C=DE
+ A6935DD34EF3087973C706FC311AA2CCF733765B S
+
+ # CN=PCA-1-Verwaltung-02/O=PKI-1-Verwaltung/C=DE
+ DC:BD:69:25:48:BD:BB:7E:31:6E:BB:80:D3:00:80:35:D4:F8:A6:CD S
+
+ # CN=Root-CA/O=Schlapphuete/L=Pullach/C=DE
+ !14:56:98:D3:FE:9C:CA:5A:31:6E:BC:81:D3:11:4E:00:90:A3:44:C2 S
+
+
+ Before entering a key into this file, you need to ensure its
+ authenticity. How to do this depends on your organisation; your
+ administrator might have already entered those keys which are
+ deemed trustworthy enough into this file. Places where to look for
+ the fingerprint of a root certificate are letters received from the
+ CA or the website of the CA (after making 100% sure that this is
+ indeed the website of that CA). You may want to consider
+ disallowing interactive updates of this file by using the *Note
+ option --no-allow-mark-trusted::. It might even be advisable to
+ change the permissions to read-only so that this file can't be
+ changed inadvertently.
+
+ As a special feature a line 'include-default' will include a global
+ list of trusted certificates (e.g. '/etc/gnupg/trustlist.txt').
+ This global list is also used if the local list is not available.
+
+ It is possible to add further flags after the 'S' for use by the
+ caller:
+
+ 'relax'
+ Relax checking of some root certificate requirements. As of
+ now this flag allows the use of root certificates with a
+ missing basicConstraints attribute (despite that it is a MUST
+ for CA certificates) and disables CRL checking for the root
+ certificate.
+
+ 'cm'
+ If validation of a certificate finally issued by a CA with
+ this flag set fails, try again using the chain validation
+ model.
+
+'sshcontrol'
+ This file is used when support for the secure shell agent protocol
+ has been enabled (*note option --enable-ssh-support::). Only keys
+ present in this file are used in the SSH protocol. You should
+ backup this file.
+
+ The 'ssh-add' tool may be used to add new entries to this file; you
+ may also add them manually. Comment lines, indicated by a leading
+ hash mark, as well as empty lines are ignored. An entry starts
+ with optional whitespace, followed by the keygrip of the key given
+ as 40 hex digits, optionally followed by the caching TTL in seconds
+ and another optional field for arbitrary flags. A non-zero TTL
+ overrides the global default as set by '--default-cache-ttl-ssh'.
+
+ The only flag support is 'confirm'. If this flag is found for a
+ key, each use of the key will pop up a pinentry to confirm the use
+ of that key. The flag is automatically set if a new key was loaded
+ into 'gpg-agent' using the option '-c' of the 'ssh-add' command.
+
+ The keygrip may be prefixed with a '!' to disable an entry entry.
+
+ The following example lists exactly one key. Note that keys
+ available through a OpenPGP smartcard in the active smartcard
+ reader are implicitly added to this list; i.e. there is no need to
+ list them.
+
+ # Key added on: 2011-07-20 20:38:46
+ # Fingerprint: 5e:8d:c4:ad:e7:af:6e:27:8a:d6:13:e4:79:ad:0b:81
+ 34B62F25E277CF13D3C6BCEBFD3F85D08F0A864B 0 confirm
+
+'private-keys-v1.d/'
+
+ This is the directory where gpg-agent stores the private keys.
+ Each key is stored in a file with the name made up of the keygrip
+ and the suffix 'key'. You should backup all files in this
+ directory and take great care to keep this backup closed away.
+
+ Note that on larger installations, it is useful to put predefined
+files into the directory '/etc/skel/.gnupg' so that newly created users
+start up with a working configuration. For existing users the a small
+helper script is provided to create these files (*note addgnupghome::).
+
+
+File: gnupg.info, Node: Agent Signals, Next: Agent Examples, Prev: Agent Configuration, Up: Invoking GPG-AGENT
+
+2.4 Use of some signals.
+========================
+
+A running 'gpg-agent' may be controlled by signals, i.e. using the
+'kill' command to send a signal to the process.
+
+ Here is a list of supported signals:
+
+'SIGHUP'
+ This signal flushes all cached passphrases and if the program has
+ been started with a configuration file, the configuration file is
+ read again. Only certain options are honored: 'quiet', 'verbose',
+ 'debug', 'debug-all', 'debug-level', 'debug-pinentry', 'no-grab',
+ 'pinentry-program', 'pinentry-invisible-char', 'default-cache-ttl',
+ 'max-cache-ttl', 'ignore-cache-for-signing',
+ 'no-allow-external-cache', 'allow-emacs-pinentry',
+ 'no-allow-mark-trusted', 'disable-scdaemon', and
+ 'disable-check-own-socket'. 'scdaemon-program' is also supported
+ but due to the current implementation, which calls the scdaemon
+ only once, it is not of much use unless you manually kill the
+ scdaemon.
+
+'SIGTERM'
+ Shuts down the process but waits until all current requests are
+ fulfilled. If the process has received 3 of these signals and
+ requests are still pending, a shutdown is forced.
+
+'SIGINT'
+ Shuts down the process immediately.
+
+'SIGUSR1'
+ Dump internal information to the log file.
+
+'SIGUSR2'
+ This signal is used for internal purposes.
+
+
+File: gnupg.info, Node: Agent Examples, Next: Agent Protocol, Prev: Agent Signals, Up: Invoking GPG-AGENT
+
+2.5 Examples
+============
+
+It is important to set the environment variable 'GPG_TTY' in your login
+shell, for example in the '~/.bashrc' init script:
+
+ export GPG_TTY=$(tty)
+
+ If you enabled the Ssh Agent Support, you also need to tell ssh about
+it by adding this to your init script:
+
+ unset SSH_AGENT_PID
+ if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+ export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+ fi
+
+
+File: gnupg.info, Node: Agent Protocol, Prev: Agent Examples, Up: Invoking GPG-AGENT
+
+2.6 Agent's Assuan Protocol
+===========================
+
+Note: this section does only document the protocol, which is used by
+GnuPG components; it does not deal with the ssh-agent protocol. To see
+the full specification of each command, use
+
+ gpg-connect-agent 'help COMMAND' /bye
+
+or just 'help' to list all available commands.
+
+The 'gpg-agent' daemon is started on demand by the GnuPG components.
+
+ To identify a key we use a thing called keygrip which is the SHA-1
+hash of an canonical encoded S-Expression of the public key as used in
+Libgcrypt. For the purpose of this interface the keygrip is given as a
+hex string. The advantage of using this and not the hash of a
+certificate is that it will be possible to use the same keypair for
+different protocols, thereby saving space on the token used to keep the
+secret keys.
+
+ The 'gpg-agent' may send status messages during a command or when
+returning from a command to inform a client about the progress or result
+of an operation. For example, the INQUIRE_MAXLEN status message may be
+sent during a server inquire to inform the client of the maximum usable
+length of the inquired data (which should not be exceeded).
+
+* Menu:
+
+* Agent PKDECRYPT:: Decrypting a session key
+* Agent PKSIGN:: Signing a Hash
+* Agent GENKEY:: Generating a Key
+* Agent IMPORT:: Importing a Secret Key
+* Agent EXPORT:: Exporting a Secret Key
+* Agent ISTRUSTED:: Importing a Root Certificate
+* Agent GET_PASSPHRASE:: Ask for a passphrase
+* Agent CLEAR_PASSPHRASE:: Expire a cached passphrase
+* Agent PRESET_PASSPHRASE:: Set a passphrase for a keygrip
+* Agent GET_CONFIRMATION:: Ask for confirmation
+* Agent HAVEKEY:: Check whether a key is available
+* Agent LEARN:: Register a smartcard
+* Agent PASSWD:: Change a Passphrase
+* Agent UPDATESTARTUPTTY:: Change the Standard Display
+* Agent GETEVENTCOUNTER:: Get the Event Counters
+* Agent GETINFO:: Return information about the process
+* Agent OPTION:: Set options for the session
+
+
+File: gnupg.info, Node: Agent PKDECRYPT, Next: Agent PKSIGN, Up: Agent Protocol
+
+2.6.1 Decrypting a session key
+------------------------------
+
+The client asks the server to decrypt a session key. The encrypted
+session key should have all information needed to select the appropriate
+secret key or to delegate it to a smartcard.
+
+ SETKEY <keyGrip>
+
+ Tell the server about the key to be used for decryption. If this is
+not used, 'gpg-agent' may try to figure out the key by trying to decrypt
+the message with each key available.
+
+ PKDECRYPT
+
+ The agent checks whether this command is allowed and then does an
+INQUIRY to get the ciphertext the client should then send the cipher
+text.
+
+ S: INQUIRE CIPHERTEXT
+ C: D (xxxxxx
+ C: D xxxx)
+ C: END
+
+ Please note that the server may send status info lines while reading
+the data lines from the client. The data send is a SPKI like S-Exp with
+this structure:
+
+ (enc-val
+ (<algo>
+ (<param_name1> <mpi>)
+ ...
+ (<param_namen> <mpi>)))
+
+ Where algo is a string with the name of the algorithm; see the
+libgcrypt documentation for a list of valid algorithms. The number and
+names of the parameters depend on the algorithm. The agent does return
+an error if there is an inconsistency.
+
+ If the decryption was successful the decrypted data is returned by
+means of "D" lines.
+
+ Here is an example session:
+ C: PKDECRYPT
+ S: INQUIRE CIPHERTEXT
+ C: D (enc-val elg (a 349324324)
+ C: D (b 3F444677CA)))
+ C: END
+ S: # session key follows
+ S: S PADDING 0
+ S: D (value 1234567890ABCDEF0)
+ S: OK descryption successful
+
+ The “PADDING” status line is only send if gpg-agent can tell what
+kind of padding is used. As of now only the value 0 is used to indicate
+that the padding has been removed.
+
+
+File: gnupg.info, Node: Agent PKSIGN, Next: Agent GENKEY, Prev: Agent PKDECRYPT, Up: Agent Protocol
+
+2.6.2 Signing a Hash
+--------------------
+
+The client ask the agent to sign a given hash value. A default key will
+be chosen if no key has been set. To set a key a client first uses:
+
+ SIGKEY <keyGrip>
+
+ This can be used multiple times to create multiple signature, the
+list of keys is reset with the next PKSIGN command or a RESET. The
+server test whether the key is a valid key to sign something and
+responds with okay.
+
+ SETHASH --hash=<name>|<algo> <hexstring>
+
+ The client can use this command to tell the server about the data
+<hexstring> (which usually is a hash) to be signed. <algo> is the
+decimal encoded hash algorithm number as used by Libgcrypt. Either
+<algo> or -hash=<name> must be given. Valid names for <name> are:
+
+'sha1'
+ The SHA-1 hash algorithm
+'sha256'
+ The SHA-256 hash algorithm
+'rmd160'
+ The RIPE-MD160 hash algorithm
+'md5'
+ The old and broken MD5 hash algorithm
+'tls-md5sha1'
+ A combined hash algorithm as used by the TLS protocol.
+
+The actual signing is done using
+
+ PKSIGN <options>
+
+ Options are not yet defined, but my later be used to choose among
+different algorithms. The agent does then some checks, asks for the
+passphrase and as a result the server returns the signature as an SPKI
+like S-expression in "D" lines:
+
+ (sig-val
+ (<algo>
+ (<param_name1> <mpi>)
+ ...
+ (<param_namen> <mpi>)))
+
+ The operation is affected by the option
+
+ OPTION use-cache-for-signing=0|1
+
+ The default of '1' uses the cache. Setting this option to '0' will
+lead 'gpg-agent' to ignore the passphrase cache. Note, that there is
+also a global command line option for 'gpg-agent' to globally disable
+the caching.
+
+ Here is an example session:
+ C: SIGKEY <keyGrip>
+ S: OK key available
+ C: SIGKEY <keyGrip>
+ S: OK key available
+ C: PKSIGN
+ S: # I did ask the user whether he really wants to sign
+ S: # I did ask the user for the passphrase
+ S: INQUIRE HASHVAL
+ C: D ABCDEF012345678901234
+ C: END
+ S: # signature follows
+ S: D (sig-val rsa (s 45435453654612121212))
+ S: OK
+
+
+File: gnupg.info, Node: Agent GENKEY, Next: Agent IMPORT, Prev: Agent PKSIGN, Up: Agent Protocol
+
+2.6.3 Generating a Key
+----------------------
+
+This is used to create a new keypair and store the secret key inside the
- active PSE -- which is in most cases a Soft-PSE. An not yet defined
- option allows to choose the storage location. To get the secret key out
++active PSE -- which is in most cases a Soft-PSE. A not-yet-defined
++option allows choosing the storage location. To get the secret key out
+of the PSE, a special export tool has to be used.
+
+ GENKEY [--no-protection] [--preset] [<cache_nonce>]
+
+ Invokes the key generation process and the server will then inquire
+on the generation parameters, like:
+
+ S: INQUIRE KEYPARM
+ C: D (genkey (rsa (nbits 1024)))
+ C: END
+
+ The format of the key parameters which depends on the algorithm is of
+the form:
+
+ (genkey
+ (algo
+ (parameter_name_1 ....)
+ ....
+ (parameter_name_n ....)))
+
+ If everything succeeds, the server returns the *public key* in a SPKI
+like S-Expression like this:
+
+ (public-key
+ (rsa
+ (n <mpi>)
+ (e <mpi>)))
+
+ Here is an example session:
+ C: GENKEY
+ S: INQUIRE KEYPARM
+ C: D (genkey (rsa (nbits 1024)))
+ C: END
+ S: D (public-key
+ S: D (rsa (n 326487324683264) (e 10001)))
+ S OK key created
+
+ The '--no-protection' option may be used to prevent prompting for a
+passphrase to protect the secret key while leaving the secret key
+unprotected. The '--preset' option may be used to add the passphrase to
+the cache using the default cache parameters.
+
+ The '--inq-passwd' option may be used to create the key with a
+supplied passphrase. When used the agent does an inquiry with the
+keyword 'NEWPASSWD' to retrieve that passphrase. This option takes
+precedence over '--no-protection'; however if the client sends a empty
+(zero-length) passphrase, this is identical to '--no-protection'.
+
+
+File: gnupg.info, Node: Agent IMPORT, Next: Agent EXPORT, Prev: Agent GENKEY, Up: Agent Protocol
+
+2.6.4 Importing a Secret Key
+----------------------------
+
+This operation is not yet supported by GpgAgent. Specialized tools are
+to be used for this.
+
+ There is no actual need because we can expect that secret keys
+created by a 3rd party are stored on a smartcard. If we have generated
+the key ourself, we do not need to import it.
+
+
+File: gnupg.info, Node: Agent EXPORT, Next: Agent ISTRUSTED, Prev: Agent IMPORT, Up: Agent Protocol
+
+2.6.5 Export a Secret Key
+-------------------------
+
+Not implemented.
+
+ Should be done by an extra tool.
+
+
+File: gnupg.info, Node: Agent ISTRUSTED, Next: Agent GET_PASSPHRASE, Prev: Agent EXPORT, Up: Agent Protocol
+
+2.6.6 Importing a Root Certificate
+----------------------------------
+
+Actually we do not import a Root Cert but provide a way to validate any
+piece of data by storing its Hash along with a description and an
+identifier in the PSE. Here is the interface description:
+
+ ISTRUSTED <fingerprint>
+
+ Check whether the OpenPGP primary key or the X.509 certificate with
+the given fingerprint is an ultimately trusted key or a trusted Root CA
+certificate. The fingerprint should be given as a hexstring (without
+any blanks or colons or whatever in between) and may be left padded with
+00 in case of an MD5 fingerprint. GPGAgent will answer with:
+
+ OK
+
+ The key is in the table of trusted keys.
+
+ ERR 304 (Not Trusted)
+
+ The key is not in this table.
+
+ Gpg needs the entire list of trusted keys to maintain the web of
+trust; the following command is therefore quite helpful:
+
+ LISTTRUSTED
+
+ GpgAgent returns a list of trusted keys line by line:
+
+ S: D 000000001234454556565656677878AF2F1ECCFF P
+ S: D 340387563485634856435645634856438576457A P
+ S: D FEDC6532453745367FD83474357495743757435D S
+ S: OK
+
+ The first item on a line is the hexified fingerprint where MD5
+fingerprints are '00' padded to the left and the second item is a flag
+to indicate the type of key (so that gpg is able to only take care of
+PGP keys). P = OpenPGP, S = S/MIME. A client should ignore the rest of
+the line, so that we can extend the format in the future.
+
+ Finally a client should be able to mark a key as trusted:
+
+ MARKTRUSTED FINGERPRINT "P"|"S"
+
+ The server will then pop up a window to ask the user whether she
+really trusts this key. For this it will probably ask for a text to be
+displayed like this:
+
+ S: INQUIRE TRUSTDESC
+ C: D Do you trust the key with the fingerprint @FPR@
+ C: D bla fasel blurb.
+ C: END
+ S: OK
+
+ Known sequences with the pattern @foo@ are replaced according to this
+table:
+
+'@FPR16@'
+ Format the fingerprint according to gpg rules for a v3 keys.
+'@FPR20@'
+ Format the fingerprint according to gpg rules for a v4 keys.
+'@FPR@'
+ Choose an appropriate format to format the fingerprint.
+'@@'
+ Replaced by a single '@'
+
+
+File: gnupg.info, Node: Agent GET_PASSPHRASE, Next: Agent CLEAR_PASSPHRASE, Prev: Agent ISTRUSTED, Up: Agent Protocol
+
+2.6.7 Ask for a passphrase
+--------------------------
+
+This function is usually used to ask for a passphrase to be used for
+symmetric encryption, but may also be used by programs which need
+special handling of passphrases. This command uses a syntax which helps
+clients to use the agent with minimum effort.
+
+ GET_PASSPHRASE [--data] [--check] [--no-ask] [--repeat[=N]] \
+ [--qualitybar] CACHE_ID \
+ [ERROR_MESSAGE PROMPT DESCRIPTION]
+
+ CACHE_ID is expected to be a string used to identify a cached
+passphrase. Use a 'X' to bypass the cache. With no other arguments the
+agent returns a cached passphrase or an error. By convention either the
+hexified fingerprint of the key shall be used for CACHE_ID or an
+arbitrary string prefixed with the name of the calling application and a
+colon: Like 'gpg:somestring'.
+
+ ERROR_MESSAGE is either a single 'X' for no error message or a string
+to be shown as an error message like (e.g. "invalid passphrase").
+Blanks must be percent escaped or replaced by '+''.
+
+ PROMPT is either a single 'X' for a default prompt or the text to be
+shown as the prompt. Blanks must be percent escaped or replaced by '+'.
+
+ DESCRIPTION is a text shown above the entry field. Blanks must be
+percent escaped or replaced by '+'.
+
+ The agent either returns with an error or with a OK followed by the
+hex encoded passphrase. Note that the length of the strings is
+implicitly limited by the maximum length of a command. If the option
+'--data' is used, the passphrase is not returned on the OK line but by
+regular data lines; this is the preferred method.
+
+ If the option '--check' is used, the standard passphrase constraints
+checks are applied. A check is not done if the passphrase has been
+found in the cache.
+
+ If the option '--no-ask' is used and the passphrase is not in the
+cache the user will not be asked to enter a passphrase but the error
+code 'GPG_ERR_NO_DATA' is returned.
+
+ If the option '--qualitybar' is used and a minimum passphrase length
+has been configured, a visual indication of the entered passphrase
+quality is shown.
+
+ CLEAR_PASSPHRASE CACHE_ID
+
+ may be used to invalidate the cache entry for a passphrase. The
+function returns with OK even when there is no cached passphrase.
+
+
+File: gnupg.info, Node: Agent CLEAR_PASSPHRASE, Next: Agent PRESET_PASSPHRASE, Prev: Agent GET_PASSPHRASE, Up: Agent Protocol
+
+2.6.8 Remove a cached passphrase
+--------------------------------
+
+Use this command to remove a cached passphrase.
+
+ CLEAR_PASSPHRASE [--mode=normal] <cache_id>
+
+ The '--mode=normal' option can be used to clear a CACHE_ID that was
+set by gpg-agent.
+
+
+File: gnupg.info, Node: Agent PRESET_PASSPHRASE, Next: Agent GET_CONFIRMATION, Prev: Agent CLEAR_PASSPHRASE, Up: Agent Protocol
+
+2.6.9 Set a passphrase for a keygrip
+------------------------------------
+
+This command adds a passphrase to the cache for the specified KEYGRIP.
+
+ PRESET_PASSPHRASE [--inquire] <string_or_keygrip> <timeout> [<hexstring>]
+
+ The passphrase is a hexidecimal string when specified. When not
+specified, the passphrase will be retrieved from the pinentry module
+unless the '--inquire' option was specified in which case the passphrase
+will be retrieved from the client.
+
+ The TIMEOUT parameter keeps the passphrase cached for the specified
+number of seconds. A value of '-1' means infinate while '0' means the
+default (currently only a timeout of -1 is allowed, which means to never
+expire it).
+
+
+File: gnupg.info, Node: Agent GET_CONFIRMATION, Next: Agent HAVEKEY, Prev: Agent PRESET_PASSPHRASE, Up: Agent Protocol
+
+2.6.10 Ask for confirmation
+---------------------------
+
+This command may be used to ask for a simple confirmation by presenting
+a text and 2 buttons: Okay and Cancel.
+
+ GET_CONFIRMATION DESCRIPTION
+
+ DESCRIPTIONis displayed along with a Okay and Cancel button. Blanks
+must be percent escaped or replaced by '+'. A 'X' may be used to
+display confirmation dialog with a default text.
+
+ The agent either returns with an error or with a OK. Note, that the
+length of DESCRIPTION is implicitly limited by the maximum length of a
+command.
+
+
+File: gnupg.info, Node: Agent HAVEKEY, Next: Agent LEARN, Prev: Agent GET_CONFIRMATION, Up: Agent Protocol
+
+2.6.11 Check whether a key is available
+---------------------------------------
+
+This can be used to see whether a secret key is available. It does not
+return any information on whether the key is somehow protected.
+
+ HAVEKEY KEYGRIPS
+
+ The agent answers either with OK or 'No_Secret_Key' (208). The
+caller may want to check for other error codes as well. More than one
+keygrip may be given. In this case the command returns success if at
+least one of the keygrips corresponds to an available secret key.
+
+
+File: gnupg.info, Node: Agent LEARN, Next: Agent PASSWD, Prev: Agent HAVEKEY, Up: Agent Protocol
+
+2.6.12 Register a smartcard
+---------------------------
+
+ LEARN [--send]
+
+ This command is used to register a smartcard. With the -send option
+given the certificates are send back.
+
+
+File: gnupg.info, Node: Agent PASSWD, Next: Agent UPDATESTARTUPTTY, Prev: Agent LEARN, Up: Agent Protocol
+
+2.6.13 Change a Passphrase
+--------------------------
+
+ PASSWD [--cache-nonce=<c>] [--passwd-nonce=<s>] [--preset] KEYGRIP
+
+ This command is used to interactively change the passphrase of the
+key identified by the hex string KEYGRIP. The '--preset' option may be
+used to add the new passphrase to the cache using the default cache
+parameters.
+
+
+File: gnupg.info, Node: Agent UPDATESTARTUPTTY, Next: Agent GETEVENTCOUNTER, Prev: Agent PASSWD, Up: Agent Protocol
+
+2.6.14 Change the standard display
+----------------------------------
+
+ UPDATESTARTUPTTY
+
+ Set the startup TTY and X-DISPLAY variables to the values of this
+session. This command is useful to direct future pinentry invocations
+to another screen. It is only required because there is no way in the
+ssh-agent protocol to convey this information.
+
+
+File: gnupg.info, Node: Agent GETEVENTCOUNTER, Next: Agent GETINFO, Prev: Agent UPDATESTARTUPTTY, Up: Agent Protocol
+
+2.6.15 Get the Event Counters
+-----------------------------
+
+ GETEVENTCOUNTER
+
+ This function return one status line with the current values of the
+event counters. The event counters are useful to avoid polling by
+delaying a poll until something has changed. The values are decimal
+numbers in the range '0' to 'UINT_MAX' and wrapping around to 0. The
+actual values should not be relied upon; they shall only be used to
+detect a change.
+
+ The currently defined counters are are:
+'ANY'
+ Incremented with any change of any of the other counters.
+'KEY'
+ Incremented for added or removed private keys.
+'CARD'
+ Incremented for changes of the card readers stati.
+
+
+File: gnupg.info, Node: Agent GETINFO, Next: Agent OPTION, Prev: Agent GETEVENTCOUNTER, Up: Agent Protocol
+
+2.6.16 Return information about the process
+-------------------------------------------
+
+This is a multipurpose function to return a variety of information.
+
+ GETINFO WHAT
+
+ The value of WHAT specifies the kind of information returned:
+'version'
+ Return the version of the program.
+'pid'
+ Return the process id of the process.
+'socket_name'
+ Return the name of the socket used to connect the agent.
+'ssh_socket_name'
+ Return the name of the socket used for SSH connections. If SSH
+ support has not been enabled the error 'GPG_ERR_NO_DATA' will be
+ returned.
+
+
+File: gnupg.info, Node: Agent OPTION, Prev: Agent GETINFO, Up: Agent Protocol
+
+2.6.17 Set options for the session
+----------------------------------
+
+Here is a list of session options which are not yet described with other
+commands. The general syntax for an Assuan option is:
+
+ OPTION KEY=VALUE
+
+Supported KEYs are:
+
+'agent-awareness'
+ This may be used to tell gpg-agent of which gpg-agent version the
+ client is aware of. gpg-agent uses this information to enable
+ features which might break older clients.
+
+'putenv'
+ Change the session's environment to be used for the Pinentry.
+ Valid values are:
+
+ 'NAME'
+ Delete envvar NAME
+ 'NAME='
+ Set envvar NAME to the empty string
+ 'NAME=VALUE'
+ Set envvar NAME to the string VALUE.
+
+'use-cache-for-signing'
+ See Assuan command 'PKSIGN'.
+
+'allow-pinentry-notify'
+ This does not need any value. It is used to enable the
+ PINENTRY_LAUNCHED inquiry.
+
+'pinentry-mode'
+ This option is used to change the operation mode of the pinentry.
+ The following values are defined:
+
+ 'ask'
+ This is the default mode which pops up a pinentry as needed.
+
+ 'cancel'
+ Instead of popping up a pinentry, return the error code
+ 'GPG_ERR_CANCELED'.
+
+ 'error'
+ Instead of popping up a pinentry, return the error code
+ 'GPG_ERR_NO_PIN_ENTRY'.
+
+ 'loopback'
+ Use a loopback pinentry. This fakes a pinentry by using
+ inquiries back to the caller to ask for a passphrase. This
+ option may only be set if the agent has been configured for
+ that. To disable this feature use *Note option
+ --no-allow-loopback-pinentry::.
+
+'cache-ttl-opt-preset'
+ This option sets the cache TTL for new entries created by GENKEY
+ and PASSWD commands when using the '--preset' option. It it is not
+ used a default value is used.
+
+'s2k-count'
+ Instead of using the standard S2K count (which is computed on the
+ fly), the given S2K count is used for new keys or when changing the
+ passphrase of a key. Values below 65536 are considered to be 0.
+ This option is valid for the entire session or until reset to 0.
+ This option is useful if the key is later used on boxes which are
+ either much slower or faster than the actual box.
+
+
+File: gnupg.info, Node: Invoking DIRMNGR, Next: Invoking GPG, Prev: Invoking GPG-AGENT, Up: Top
+
+3 Invoking DIRMNGR
+******************
+
+Since version 2.1 of GnuPG, 'dirmngr' takes care of accessing the
+OpenPGP keyservers. As with previous versions it is also used as a
+server for managing and downloading certificate revocation lists (CRLs)
+for X.509 certificates, downloading X.509 certificates, and providing
+access to OCSP providers. Dirmngr is invoked internally by 'gpg',
+'gpgsm', or via the 'gpg-connect-agent' tool.
+
- For historical reasons it is also possible to start 'dirmngr' in a
- system daemon mode which uses a different directory layout. However,
- this mode is deprecated and may eventually be removed.
-
+*Note Option Index::,for an index to 'DIRMNGR''s commands and options.
+
+* Menu:
+
+* Dirmngr Commands:: List of all commands.
+* Dirmngr Options:: List of all options.
+* Dirmngr Configuration:: Configuration files.
+* Dirmngr Signals:: Use of signals.
+* Dirmngr Examples:: Some usage examples.
+* Dirmngr Protocol:: The protocol dirmngr uses.
+
+
+File: gnupg.info, Node: Dirmngr Commands, Next: Dirmngr Options, Up: Invoking DIRMNGR
+
+3.1 Commands
+============
+
+Commands are not distinguished from options except for the fact that
+only one command is allowed.
+
+'--version'
+ Print the program version and licensing information. Note that you
+ cannot abbreviate this command.
+
+'--help, -h'
+ Print a usage message summarizing the most useful command-line
+ options. Not that you cannot abbreviate this command.
+
+'--dump-options'
+ Print a list of all available options and commands. Note that you
+ cannot abbreviate this command.
+
+'--server'
+ Run in server mode and wait for commands on the 'stdin'. The
+ default mode is to create a socket and listen for commands there.
+ This is only used for testing.
+
+'--daemon'
+ Run in background daemon mode and listen for commands on a socket.
+ Note that this also changes the default home directory and enables
+ the internal certificate validation code. This mode is deprecated.
+
+'--list-crls'
+ List the contents of the CRL cache on 'stdout'. This is probably
+ only useful for debugging purposes.
+
+'--load-crl FILE'
+ This command requires a filename as additional argument, and it
+ will make Dirmngr try to import the CRL in FILE into it's cache.
+ Note, that this is only possible if Dirmngr is able to retrieve the
+ CA's certificate directly by its own means. In general it is
+ better to use 'gpgsm''s '--call-dirmngr loadcrl filename' command
+ so that 'gpgsm' can help dirmngr.
+
+'--fetch-crl URL'
+ This command requires an URL as additional argument, and it will
+ make dirmngr try to retrieve an import the CRL from that URL into
+ it's cache. This is mainly useful for debugging purposes. The
+ 'dirmngr-client' provides the same feature for a running dirmngr.
+
+'--shutdown'
+ This commands shuts down an running instance of Dirmngr. This
+ command has currently no effect.
+
+'--flush'
+ This command removes all CRLs from Dirmngr's cache. Client
+ requests will thus trigger reading of fresh CRLs.
+
+
+File: gnupg.info, Node: Dirmngr Options, Next: Dirmngr Configuration, Prev: Dirmngr Commands, Up: Invoking DIRMNGR
+
+3.2 Option Summary
+==================
+
+'--options FILE'
+ Reads configuration from FILE instead of from the default per-user
+ configuration file. The default configuration file is named
+ 'dirmngr.conf' and expected in the home directory.
+
+'--homedir DIR'
+ Set the name of the home directory to DIR. This option is only
+ effective when used on the command line. The default depends on
+ the running mode:
+
+ With '--daemon' given on the commandline
+ the directory named '/etc/gnupg' is used for configuration
+ files and '/usr/local/var/cache/gnupg' for cached CRLs.
+
+ Without '--daemon' given on the commandline
+ the directory named '.gnupg' directly below the home directory
+ of the user unless the environment variable 'GNUPGHOME' has
+ been set in which case its value will be used. All kind of
+ data is stored below this directory.
+
+'-v'
+'--verbose'
+ Outputs additional information while running. You can increase the
+ verbosity by giving several verbose commands to DIRMNGR, such as
+ '-vv'.
+
+'--log-file FILE'
+ Append all logging output to FILE. This is very helpful in seeing
+ what the agent actually does.
+
+'--debug-level LEVEL'
+ Select the debug level for investigating problems. LEVEL may be a
+ numeric value or by a keyword:
+
+ 'none'
+ No debugging at all. A value of less than 1 may be used
+ instead of the keyword.
+ 'basic'
+ Some basic debug messages. A value between 1 and 2 may be
+ used instead of the keyword.
+ 'advanced'
+ More verbose debug messages. A value between 3 and 5 may be
+ used instead of the keyword.
+ 'expert'
+ Even more detailed messages. A value between 6 and 8 may be
+ used instead of the keyword.
+ 'guru'
+ All of the debug messages you can get. A value greater than 8
+ may be used instead of the keyword. The creation of hash
+ tracing files is only enabled if the keyword is used.
+
+ How these messages are mapped to the actual debugging flags is not
+ specified and may change with newer releases of this program. They
+ are however carefully selected to best aid in debugging.
+
+'--debug FLAGS'
+ This option is only useful for debugging and the behaviour may
+ change at any time without notice. FLAGS are bit encoded and may
+ be given in usual C-Syntax.
+
+'--debug-all'
+ Same as '--debug=0xffffffff'
+
+'--gnutls-debug LEVEL'
+ Enable debugging of GNUTLS at LEVEL.
+
+'--debug-wait N'
+ When running in server mode, wait N seconds before entering the
+ actual processing loop and print the pid. This gives time to
+ attach a debugger.
+
+'-s'
+'--sh'
+'-c'
+'--csh'
+ Format the info output in daemon mode for use with the standard
+ Bourne shell respective the C-shell . The default ist to guess it
+ based on the environment variable 'SHELL' which is in almost all
+ cases sufficient.
+
+'--force'
+ Enabling this option forces loading of expired CRLs; this is only
+ useful for debugging.
+
+'--use-tor'
+ This option switches Dirmngr and thus GnuPG into "Tor mode" to
+ route all network access via Tor (an anonymity network). WARNING:
+ As of now this still leaks the DNS queries; e.g. to lookup the
+ hosts in a keyserver pool. Certain other features are disabled if
+ this mode is active.
+
+'--keyserver NAME'
+ Use NAME as your keyserver. This is the server that 'gpg'
+ communicates with to receive keys, send keys, and search for keys.
+ The format of the NAME is a URI: 'scheme:[//]keyservername[:port]'
+ The scheme is the type of keyserver: "hkp" for the HTTP (or
+ compatible) keyservers, "ldap" for the LDAP keyservers, or "mailto"
+ for the Graff email keyserver. Note that your particular
+ installation of GnuPG may have other keyserver types available as
+ well. Keyserver schemes are case-insensitive. After the keyserver
+ name, optional keyserver configuration options may be provided.
+ These are the same as the '--keyserver-options' of 'gpg', but apply
+ only to this particular keyserver.
+
+ Most keyservers synchronize with each other, so there is generally
+ no need to send keys to more than one server. The keyserver
+ 'hkp://keys.gnupg.net' uses round robin DNS to give a different
+ keyserver each time you use it.
+
+ If exactly two keyservers are configured and only one is a Tor
+ hidden service (.onion), Dirmngr selects the keyserver to use
+ depending on whether Tor is locally running or not. The check for
+ a running Tor is done for each new connection.
+
+'--nameserver IPADDR'
+ In "Tor mode" Dirmngr uses a public resolver via Tor to resolve DNS
+ names. If the default public resolver, which is '8.8.8.8', shall
+ not be used a different one can be given using this option. Note
+ that a numerical IP address must be given (IPv6 or IPv4) and that
+ no error checking is done for IPADDR. DNS queries in Tor mode do
+ only work if GnuPG as been build with ADNS support.
+
+'--disable-ldap'
+ Entirely disables the use of LDAP.
+
+'--disable-http'
+ Entirely disables the use of HTTP.
+
+'--ignore-http-dp'
+ When looking for the location of a CRL, the to be tested
+ certificate usually contains so called "CRL Distribution Point"
+ (DP) entries which are URLs describing the way to access the CRL.
+ The first found DP entry is used. With this option all entries
+ using the HTTP scheme are ignored when looking for a suitable DP.
+
+'--ignore-ldap-dp'
+ This is similar to '--ignore-http-dp' but ignores entries using the
+ LDAP scheme. Both options may be combined resulting in ignoring
+ DPs entirely.
+
+'--ignore-ocsp-service-url'
+ Ignore all OCSP URLs contained in the certificate. The effect is
+ to force the use of the default responder.
+
+'--honor-http-proxy'
+ If the environment variable 'http_proxy' has been set, use its
+ value to access HTTP servers.
+
+'--http-proxy HOST[:PORT]'
+ Use HOST and PORT to access HTTP servers. The use of this option
+ overrides the environment variable 'http_proxy' regardless whether
+ '--honor-http-proxy' has been set.
+
+'--ldap-proxy HOST[:PORT]'
- Use HOST and PORT to connect to LDAP servers. If PORT is ommitted,
++ Use HOST and PORT to connect to LDAP servers. If PORT is omitted,
+ port 389 (standard LDAP port) is used. This overrides any
+ specified host and port part in a LDAP URL and will also be used if
- host and port have been ommitted from the URL.
++ host and port have been omitted from the URL.
+
+'--only-ldap-proxy'
+ Never use anything else but the LDAP "proxy" as configured with
+ '--ldap-proxy'. Usually 'dirmngr' tries to use other configured
+ LDAP server if the connection using the "proxy" failed.
+
+'--ldapserverlist-file FILE'
+ Read the list of LDAP servers to consult for CRLs and certificates
+ from file instead of the default per-user ldap server list file.
+ The default value for FILE is 'dirmngr_ldapservers.conf' or
+ 'ldapservers.conf' when running in '--daemon' mode.
+
+ This server list file contains one LDAP server per line in the
+ format
+
+ HOSTNAME:PORT:USERNAME:PASSWORD:BASE_DN
+
+ Lines starting with a '#' are comments.
+
+ Note that as usual all strings entered are expected to be UTF-8
+ encoded. Obviously this will lead to problems if the password has
- orginally been encoded as Latin-1. There is no other solution here
- than to put such a password in the binary encoding into the file
- (i.e. non-ascii characters won't show up readable).(1)
++ originally been encoded as Latin-1. There is no other solution
++ here than to put such a password in the binary encoding into the
++ file (i.e. non-ascii characters won't show up readable).(1)
+
+'--ldaptimeout SECS'
+ Specify the number of seconds to wait for an LDAP query before
+ timing out. The default is currently 100 seconds. 0 will never
+ timeout.
+
+'--add-servers'
+ This options makes dirmngr add any servers it discovers when
+ validating certificates against CRLs to the internal list of
+ servers to consult for certificates and CRLs.
+
+ This options is useful when trying to validate a certificate that
+ has a CRL distribution point that points to a server that is not
+ already listed in the ldapserverlist. Dirmngr will always go to
+ this server and try to download the CRL, but chances are high that
+ the certificate used to sign the CRL is located on the same server.
+ So if dirmngr doesn't add that new server to list, it will often
+ not be able to verify the signature of the CRL unless the
+ '--add-servers' option is used.
+
+ Note: The current version of dirmngr has this option disabled by
+ default.
+
+'--allow-ocsp'
+ This option enables OCSP support if requested by the client.
+
+ OCSP requests are rejected by default because they may violate the
+ privacy of the user; for example it is possible to track the time
+ when a user is reading a mail.
+
+'--ocsp-responder URL'
+ Use URL as the default OCSP Responder if the certificate does not
+ contain information about an assigned responder. Note, that
+ '--ocsp-signer' must also be set to a valid certificate.
+
+'--ocsp-signer FPR|FILE'
+ Use the certificate with the fingerprint FPR to check the responses
+ of the default OCSP Responder. Alternativly a filename can be
+ given in which case the respinse is expected to be signed by one of
+ the certificates described in that file. Any argument which
+ contains a slash, dot or tilde is considered a filename. Usual
+ filename expansion takes place: A tilde at the start followed by a
+ slash is replaced by the content of 'HOME', no slash at start
+ describes a relative filename which will be searched at the home
+ directory. To make sure that the FILE is searched in the home
+ directory, either prepend the name with "./" or use a name which
+ contains a dot.
+
+ If a response has been signed by a certificate described by these
+ fingerprints no further check upon the validity of this certificate
+ is done.
+
+ The format of the FILE is a list of SHA-1 fingerprint, one per line
+ with optional colons between the bytes. Empty lines and lines
+ prefix with a hash mark are ignored.
+
+'--ocsp-max-clock-skew N'
+ The number of seconds a skew between the OCSP responder and them
+ local clock is accepted. Default is 600 (20 minutes).
+
+'--ocsp-max-period N'
+ Seconds a response is at maximum considered valid after the time
+ given in the thisUpdate field. Default is 7776000 (90 days).
+
+'--ocsp-current-period N'
+ The number of seconds an OCSP response is considered valid after
+ the time given in the NEXT_UPDATE datum. Default is 10800 (3
+ hours).
+
+'--max-replies N'
+ Do not return more that N items in one query. The default is 10.
+
+'--ignore-cert-extension OID'
+ Add OID to the list of ignored certificate extensions. The OID is
+ expected to be in dotted decimal form, like '2.5.29.3'. This
+ option may be used more than once. Critical flagged certificate
+ extensions matching one of the OIDs in the list are treated as if
+ they are actually handled and thus the certificate won't be
+ rejected due to an unknown critical extension. Use this option
+ with care because extensions are usually flagged as critical for a
+ reason.
+
+'--hkp-cacert FILE'
+ Use the root certificates in FILE for verification of the TLS
+ certificates used with 'hkps' (keyserver access over TLS). If the
+ file is in PEM format a suffix of '.pem' is expected for FILE.
+ This option may be given multiple times to add more root
+ certificates. Tilde expansion is supported.
+
+ ---------- Footnotes ----------
+
- (1) The 'gpgconf' tool might be helpful for frontends as it allows to
- edit this configuration file using percent escaped strings.
++ (1) The 'gpgconf' tool might be helpful for frontends as it enables
++editing this configuration file using percent-escaped strings.
+
+
+File: gnupg.info, Node: Dirmngr Configuration, Next: Dirmngr Signals, Prev: Dirmngr Options, Up: Invoking DIRMNGR
+
+3.3 Configuration
+=================
+
+Dirmngr makes use of several directories when running in daemon mode:
+
+'~/.gnupg'
- '/etc/gnupg'
- The first is the standard home directory for all configuration
- files. In the deprecated system daemon mode the second directory
- is used instead.
++ This is the standard home directory for all configuration files.
+
+'/etc/gnupg/trusted-certs'
+ This directory should be filled with certificates of Root CAs you
- are trusting in checking the CRLs and signing OCSP Reponses.
++ are trusting in checking the CRLs and signing OCSP Responses.
+
+ Usually these are the same certificates you use with the
+ applications making use of dirmngr. It is expected that each of
+ these certificate files contain exactly one DER encoded certificate
+ in a file with the suffix '.crt' or '.der'. 'dirmngr' reads those
+ certificates on startup and when given a SIGHUP. Certificates which
+ are not readable or do not make up a proper X.509 certificate are
+ ignored; see the log file for details.
+
+ Applications using dirmngr (e.g. gpgsm) can request these
+ certificates to complete a trust chain in the same way as with the
+ extra-certs directory (see below).
+
+ Note that for OCSP responses the certificate specified using the
+ option '--ocsp-signer' is always considered valid to sign OCSP
+ requests.
+
+'/etc/gnupg/extra-certs'
+ This directory may contain extra certificates which are preloaded
+ into the interal cache on startup. Applications using dirmngr
+ (e.g. gpgsm) can request cached certificates to complete a trust
+ chain. This is convenient in cases you have a couple intermediate
+ CA certificates or certificates ususally used to sign OCSP
- reponses. These certificates are first tried before going out to
++ responses. These certificates are first tried before going out to
+ the net to look for them. These certificates must also be DER
+ encoded and suffixed with '.crt' or '.der'.
+
- '/usr/local/var/run/gnupg'
- This directory is only used in the deprecated system daemon mode.
- It keeps the socket file for accessing 'dirmngr' services. The
- name of the socket file will be 'S.dirmngr'. Make sure that this
- directory has the proper permissions to let 'dirmngr' create the
- socket file and that eligible users may read and write to that
- socket.
-
+'~/.gnupg/crls.d'
- '/usr/local/var/cache/gnupg/crls.d'
- The first directory is used to store cached CRLs. The 'crls.d'
- part will be created by dirmngr if it does not exists but you need
- to make sure that the upper directory exists. The second directory
- is used instead in the deprecated systems daemon mode.
++ This directory is used to store cached CRLs. The 'crls.d' part
++ will be created by dirmngr if it does not exists but you need to
++ make sure that the upper directory exists.
+
+ To be able to see what's going on you should create the configure
+file '~/gnupg/dirmngr.conf' with at least one line:
+
+ log-file ~/dirmngr.log
+
+ To be able to perform OCSP requests you probably want to add the
+line:
+
+ allow-ocsp
+
+ To make sure that new options are read and that after the
+installation of a new GnuPG versions the installed dirmngr is running,
+you may want to kill an existing dirmngr first:
+
+ gpgconf --kill dirmngr
+
+ You may check the log file to see whether all desired root
+certificates have been loaded correctly.
+
+
+File: gnupg.info, Node: Dirmngr Signals, Next: Dirmngr Examples, Prev: Dirmngr Configuration, Up: Invoking DIRMNGR
+
+3.4 Use of signals.
+===================
+
+A running 'dirmngr' may be controlled by signals, i.e. using the 'kill'
+command to send a signal to the process.
+
+ Here is a list of supported signals:
+
+'SIGHUP'
+ This signals flushes all internally cached CRLs as well as any
+ cached certificates. Then the certificate cache is reinitialized
+ as on startup. Options are re-read from the configuration file.
+ Instead of sending this signal it is better to use
+ gpgconf --reload dirmngr
+
+'SIGTERM'
+ Shuts down the process but waits until all current requests are
+ fulfilled. If the process has received 3 of these signals and
+ requests are still pending, a shutdown is forced. You may also use
+ gpgconf --kill dirmngr
+ instead of this signal
+
+'SIGINT'
+ Shuts down the process immediately.
+
+'SIGUSR1'
+ This prints some caching statistics to the log file.
+
+
+File: gnupg.info, Node: Dirmngr Examples, Next: Dirmngr Protocol, Prev: Dirmngr Signals, Up: Invoking DIRMNGR
+
+3.5 Examples
+============
+
+Here is an example on how to show dirmngr's internal table of OpenPGP
+keyserver addresses. The output is intended for debugging purposes and
+not part of a defined API.
+
+ gpg-connect-agent --dirmngr 'keyserver --hosttable' /bye
+
+ To inhibit the use of a particular host you have noticed in one of
+the keyserver pools, you may use
+
+ gpg-connect-agent --dirmngr 'keyserver --dead pgpkeys.bnd.de' /bye
+
+ The description of the 'keyserver' command can be printed using
+
+ gpg-connect-agent --dirmngr 'help keyserver' /bye
+
+
+File: gnupg.info, Node: Dirmngr Protocol, Prev: Dirmngr Examples, Up: Invoking DIRMNGR
+
+3.6 Dirmngr's Assuan Protocol
+=============================
+
+Assuan is the IPC protocol used to access dirmngr. This is a
+description of the commands implemented by dirmngr.
+
+* Menu:
+
+* Dirmngr LOOKUP:: Look up a certificate via LDAP
+* Dirmngr ISVALID:: Validate a certificate using a CRL or OCSP.
+* Dirmngr CHECKCRL:: Validate a certificate using a CRL.
+* Dirmngr CHECKOCSP:: Validate a certificate using OCSP.
+* Dirmngr CACHECERT:: Put a certificate into the internal cache.
+* Dirmngr VALIDATE:: Validate a certificate for debugging.
+
+
+File: gnupg.info, Node: Dirmngr LOOKUP, Next: Dirmngr ISVALID, Up: Dirmngr Protocol
+
+3.6.1 Return the certificate(s) found
+-------------------------------------
+
+Lookup certificate. To allow multiple patterns (which are ORed) quoting
+is required: Spaces are to be translated into "+" or into "%20";
+obviously this requires that the usual escape quoting rules are applied.
+The server responds with:
+
+ S: D <DER encoded certificate>
+ S: END
+ S: D <second DER encoded certificate>
+ S: END
+ S: OK
+
+ In this example 2 certificates are returned. The server may return
+any number of certificates; OK will also be returned when no
+certificates were found. The dirmngr might return a status line
+
+ S: S TRUNCATED <n>
+
+ To indicate that the output was truncated to N items due to a
+limitation of the server or by an arbitrary set limit.
+
+ The option '--url' may be used if instead of a search pattern a
+complete URL to the certificate is known:
+
+ C: LOOKUP --url CN%3DWerner%20Koch,o%3DIntevation%20GmbH,c%3DDE?userCertificate
+
+ If the option '--cache-only' is given, no external lookup is done so
+that only certificates from the cache are returned.
+
+ With the option '--single', the first and only the first match will
+be returned. Unless option '--cache-only' is also used, no local lookup
+will be done in this case.
+
+
+File: gnupg.info, Node: Dirmngr ISVALID, Next: Dirmngr CHECKCRL, Prev: Dirmngr LOOKUP, Up: Dirmngr Protocol
+
+3.6.2 Validate a certificate using a CRL or OCSP
+------------------------------------------------
+
+ ISVALID [--only-ocsp] [--force-default-responder] CERTID|CERTFPR
+
+ Check whether the certificate described by the CERTID has been
+revoked. Due to caching, the Dirmngr is able to answer immediately in
+most cases.
+
+ The CERTID is a hex encoded string consisting of two parts, delimited
+by a single dot. The first part is the SHA-1 hash of the issuer name
+and the second part the serial number.
+
+ Alternatively the certificate's SHA-1 fingerprint CERTFPR may be
+given in which case an OCSP request is done before consulting the CRL.
+If the option '--only-ocsp' is given, no fallback to a CRL check will be
+used. If the option '--force-default-responder' is given, only the
+default OCSP responder will be used and any other methods of obtaining
+an OCSP responder URL won't be used.
+
+Common return values are:
+
+'GPG_ERR_NO_ERROR (0)'
+ This is the positive answer: The certificate is not revoked and we
+ have an up-to-date revocation list for that certificate. If OCSP
+ was used the responder confirmed that the certificate has not been
+ revoked.
+
+'GPG_ERR_CERT_REVOKED'
+ This is the negative answer: The certificate has been revoked.
+ Either it is in a CRL and that list is up to date or an OCSP
+ responder informed us that it has been revoked.
+
+'GPG_ERR_NO_CRL_KNOWN'
+ No CRL is known for this certificate or the CRL is not valid or out
+ of date.
+
+'GPG_ERR_NO_DATA'
+ The OCSP responder returned an "unknown" status. This means that
+ it is not aware of the certificate's status.
+
+'GPG_ERR_NOT_SUPPORTED'
+ This is commonly seen if OCSP support has not been enabled in the
+ configuration.
+
+ If DirMngr has not enough information about the given certificate
+(which is the case for not yet cached certificates), it will will
+inquire the missing data:
+
+ S: INQUIRE SENDCERT <CertID>
+ C: D <DER encoded certificate>
+ C: END
+
+ A client should be aware that DirMngr may ask for more than one
+certificate.
+
+ If Dirmngr has a certificate but the signature of the certificate
+could not been validated because the root certificate is not known to
+dirmngr as trusted, it may ask back to see whether the client trusts
+this the root certificate:
+
+ S: INQUIRE ISTRUSTED <CertHexfpr>
+ C: D 1
+ C: END
+
+ Only this answer will let Dirmngr consider the CRL as valid.
+
+
+File: gnupg.info, Node: Dirmngr CHECKCRL, Next: Dirmngr CHECKOCSP, Prev: Dirmngr ISVALID, Up: Dirmngr Protocol
+
+3.6.3 Validate a certificate using a CRL
+----------------------------------------
+
+Check whether the certificate with FINGERPRINT (SHA-1 hash of the entire
+X.509 certificate blob) is valid or not by consulting the CRL
+responsible for this certificate. If the fingerprint has not been given
+or the certificate is not know, the function inquires the certificate
+using:
+
+ S: INQUIRE TARGETCERT
+ C: D <DER encoded certificate>
+ C: END
+
+ Thus the caller is expected to return the certificate for the request
+(which should match FINGERPRINT) as a binary blob. Processing then
+takes place without further interaction; in particular dirmngr tries to
+locate other required certificate by its own mechanism which includes a
+local certificate store as well as a list of trusted root certificates.
+
+The return code is 0 for success; i.e. the certificate has not been
+revoked or one of the usual error codes from libgpg-error.
+
+
+File: gnupg.info, Node: Dirmngr CHECKOCSP, Next: Dirmngr CACHECERT, Prev: Dirmngr CHECKCRL, Up: Dirmngr Protocol
+
+3.6.4 Validate a certificate using OCSP
+---------------------------------------
+
+ CHECKOCSP [--force-default-responder] [FINGERPRINT]
+
+ Check whether the certificate with FINGERPRINT (the SHA-1 hash of the
+entire X.509 certificate blob) is valid by consulting the appropiate
+OCSP responder. If the fingerprint has not been given or the
+certificate is not known by Dirmngr, the function inquires the
+certificate using:
+
+ S: INQUIRE TARGETCERT
+ C: D <DER encoded certificate>
+ C: END
+
+ Thus the caller is expected to return the certificate for the request
+(which should match FINGERPRINT) as a binary blob. Processing then
+takes place without further interaction; in particular dirmngr tries to
+locate other required certificates by its own mechanism which includes a
+local certificate store as well as a list of trusted root certificates.
+
+ If the option '--force-default-responder' is given, only the default
+OCSP responder is used. This option is the per-command variant of the
+global option '--ignore-ocsp-service-url'.
+
+The return code is 0 for success; i.e. the certificate has not been
+revoked or one of the usual error codes from libgpg-error.
+
+
+File: gnupg.info, Node: Dirmngr CACHECERT, Next: Dirmngr VALIDATE, Prev: Dirmngr CHECKOCSP, Up: Dirmngr Protocol
+
+3.6.5 Put a certificate into the internal cache
+-----------------------------------------------
+
+Put a certificate into the internal cache. This command might be useful
+if a client knows in advance certificates required for a test and wnats
+to make sure they get added to the internal cache. It is also helpful
+for debugging. To get the actual certificate, this command immediately
+inquires it using
+
+ S: INQUIRE TARGETCERT
+ C: D <DER encoded certificate>
+ C: END
+
+ Thus the caller is expected to return the certificate for the request
+as a binary blob.
+
+The return code is 0 for success; i.e. the certificate has not been
+succesfully cached or one of the usual error codes from libgpg-error.
+
+
+File: gnupg.info, Node: Dirmngr VALIDATE, Prev: Dirmngr CACHECERT, Up: Dirmngr Protocol
+
+3.6.6 Validate a certificate for debugging
+------------------------------------------
+
+Validate a certificate using the certificate validation function used
+internally by dirmngr. This command is only useful for debugging. To
+get the actual certificate, this command immediately inquires it using
+
+ S: INQUIRE TARGETCERT
+ C: D <DER encoded certificate>
+ C: END
+
+ Thus the caller is expected to return the certificate for the request
+as a binary blob.
+
+
+File: gnupg.info, Node: Invoking GPG, Next: Invoking GPGSM, Prev: Invoking DIRMNGR, Up: Top
+
+4 Invoking GPG
+**************
+
+'gpg' is the OpenPGP part of the GNU Privacy Guard (GnuPG). It is a tool
+to provide digital encryption and signing services using the OpenPGP
+standard. 'gpg' features complete key management and all bells and
+whistles you can expect from a decent OpenPGP implementation.
+
+ Note that this version of GnuPG features all modern algorithms and
+should thus be preferred over older GnuPG versions. If you are looking
+for version 1 of GnuPG, you may find that version installed under the
+name 'gpg1'.
+
+ *Note Option Index::, for an index to 'gpg''s commands and options.
+
+* Menu:
+
+* GPG Commands:: List of all commands.
+* GPG Options:: List of all options.
+* GPG Configuration:: Configuration files.
+* GPG Examples:: Some usage examples.
+
+Developer information:
+* Unattended Usage of GPG:: Using 'gpg' from other programs.
+
+
+File: gnupg.info, Node: GPG Commands, Next: GPG Options, Up: Invoking GPG
+
+4.1 Commands
+============
+
+Commands are not distinguished from options except for the fact that
+only one command is allowed.
+
+ 'gpg' may be run with no commands, in which case it will perform a
+reasonable action depending on the type of file it is given as input (an
+encrypted message is decrypted, a signature is verified, a file
+containing keys is listed).
+
+ Please remember that option as well as command parsing stops as soon
+as a non-option is encountered, you can explicitly stop parsing by using
+the special option '--'.
+
+* Menu:
+
+* General GPG Commands:: Commands not specific to the functionality.
+* Operational GPG Commands:: Commands to select the type of operation.
+* OpenPGP Key Management:: How to manage your keys.
+
+
+File: gnupg.info, Node: General GPG Commands, Next: Operational GPG Commands, Up: GPG Commands
+
+4.1.1 Commands not specific to the function
+-------------------------------------------
+
+'--version'
+ Print the program version and licensing information. Note that you
+ cannot abbreviate this command.
+
+'--help'
+'-h'
+ Print a usage message summarizing the most useful command line
+ options. Note that you cannot abbreviate this command.
+
+'--warranty'
+ Print warranty information.
+
+'--dump-options'
+ Print a list of all available options and commands. Note that you
+ cannot abbreviate this command.
+
+
+File: gnupg.info, Node: Operational GPG Commands, Next: OpenPGP Key Management, Prev: General GPG Commands, Up: GPG Commands
+
+4.1.2 Commands to select the type of operation
+----------------------------------------------
+
+'--sign'
+'-s'
+ Make a signature. This command may be combined with '--encrypt'
+ (for a signed and encrypted message), '--symmetric' (for a signed
+ and symmetrically encrypted message), or '--encrypt' and
+ '--symmetric' together (for a signed message that may be decrypted
+ via a secret key or a passphrase). The key to be used for signing
+ is chosen by default or can be set with the '--local-user' and
+ '--default-key' options.
+
+'--clearsign'
+ Make a clear text signature. The content in a clear text signature
+ is readable without any special software. OpenPGP software is only
+ needed to verify the signature. Clear text signatures may modify
+ end-of-line whitespace for platform independence and are not
+ intended to be reversible. The key to be used for signing is
+ chosen by default or can be set with the '--local-user' and
+ '--default-key' options.
+
+'--detach-sign'
+'-b'
+ Make a detached signature.
+
+'--encrypt'
+'-e'
+ Encrypt data. This option may be combined with '--sign' (for a
+ signed and encrypted message), '--symmetric' (for a message that
+ may be decrypted via a secret key or a passphrase), or '--sign' and
+ '--symmetric' together (for a signed message that may be decrypted
+ via a secret key or a passphrase).
+
+'--symmetric'
+'-c'
+ Encrypt with a symmetric cipher using a passphrase. The default
+ symmetric cipher used is AES-128, but may be chosen with the
+ '--cipher-algo' option. This option may be combined with '--sign'
+ (for a signed and symmetrically encrypted message), '--encrypt'
+ (for a message that may be decrypted via a secret key or a
+ passphrase), or '--sign' and '--encrypt' together (for a signed
+ message that may be decrypted via a secret key or a passphrase).
+
+'--store'
+ Store only (make a simple literal data packet).
+
+'--decrypt'
+'-d'
+ Decrypt the file given on the command line (or STDIN if no file is
+ specified) and write it to STDOUT (or the file specified with
+ '--output'). If the decrypted file is signed, the signature is
+ also verified. This command differs from the default operation, as
+ it never writes to the filename which is included in the file and
+ it rejects files which don't begin with an encrypted message.
+
+'--verify'
+ Assume that the first argument is a signed file and verify it
+ without generating any output. With no arguments, the signature
+ packet is read from STDIN. If only a one argument is given, it is
+ expected to be a complete signature.
+
+ With more than 1 argument, the first should be a detached signature
+ and the remaining files make up the the signed data. To read the
+ signed data from STDIN, use '-' as the second filename. For
+ security reasons a detached signature cannot read the signed
+ material from STDIN without denoting it in the above way.
+
+ Note: If the option '--batch' is not used, 'gpg' may assume that a
+ single argument is a file with a detached signature and it will try
+ to find a matching data file by stripping certain suffixes. Using
+ this historical feature to verify a detached signature is strongly
+ discouraged; always specify the data file too.
+
+ Note: When verifying a cleartext signature, 'gpg' verifies only
+ what makes up the cleartext signed data and not any extra data
+ outside of the cleartext signature or header lines following
+ directly the dash marker line. The option '--output' may be used
+ to write out the actual signed data; but there are other pitfalls
+ with this format as well. It is suggested to avoid cleartext
+ signatures in favor of detached signatures.
+
+'--multifile'
+ This modifies certain other commands to accept multiple files for
+ processing on the command line or read from STDIN with each
+ filename on a separate line. This allows for many files to be
+ processed at once. '--multifile' may currently be used along with
+ '--verify', '--encrypt', and '--decrypt'. Note that '--multifile
+ --verify' may not be used with detached signatures.
+
+'--verify-files'
+ Identical to '--multifile --verify'.
+
+'--encrypt-files'
+ Identical to '--multifile --encrypt'.
+
+'--decrypt-files'
+ Identical to '--multifile --decrypt'.
+
+'--list-keys'
+'-k'
+'--list-public-keys'
+ List all keys from the public keyrings, or just the keys given on
+ the command line.
+
+ Avoid using the output of this command in scripts or other programs
+ as it is likely to change as GnuPG changes. See '--with-colons'
+ for a machine-parseable key listing command that is appropriate for
+ use in scripts and other programs. Never use the regular output
+ for scripts - it is only for human consumption.
+
+'--list-secret-keys'
+'-K'
+ List all keys from the secret keyrings, or just the ones given on
+ the command line. A '#' after the letters 'sec' means that the
+ secret key is not usable (for example, if it was created via
+ '--export-secret-subkeys'). See also '--list-keys'.
+
+'--list-sigs'
+ Same as '--list-keys', but the signatures are listed too. This
+ command has the same effect as using '--list-keys' with
+ '--with-sig-list'.
+
+ For each signature listed, there are several flags in between the
+ "sig" tag and keyid. These flags give additional information about
+ each signature. From left to right, they are the numbers 1-3 for
+ certificate check level (see '--ask-cert-level'), "L" for a local
+ or non-exportable signature (see '--lsign-key'), "R" for a
+ nonRevocable signature (see the '--edit-key' command "nrsign"), "P"
+ for a signature that contains a policy URL (see
+ '--cert-policy-url'), "N" for a signature that contains a notation
+ (see '--cert-notation'), "X" for an eXpired signature (see
+ '--ask-cert-expire'), and the numbers 1-9 or "T" for 10 and above
+ to indicate trust signature levels (see the '--edit-key' command
+ "tsign").
+
+'--check-sigs'
+ Same as '--list-sigs', but the signatures are verified. Note that
+ for performance reasons the revocation status of a signing key is
+ not shown. This command has the same effect as using '--list-keys'
+ with '--with-sig-check'.
+
+ The status of the verification is indicated by a flag directly
+ following the "sig" tag (and thus before the flags described above
+ for '--list-sigs'). A "!" indicates that the signature has been
+ successfully verified, a "-" denotes a bad signature and a "%" is
+ used if an error occurred while checking the signature (e.g. a non
+ supported algorithm).
+
+'--locate-keys'
+ Locate the keys given as arguments. This command basically uses
+ the same algorithm as used when locating keys for encryption or
+ signing and may thus be used to see what keys 'gpg' might use. In
+ particular external methods as defined by '--auto-key-locate' may
+ be used to locate a key. Only public keys are listed.
+
+'--fingerprint'
+ List all keys (or the specified ones) along with their
+ fingerprints. This is the same output as '--list-keys' but with
+ the additional output of a line with the fingerprint. May also be
+ combined with '--list-sigs' or '--check-sigs'. If this command is
+ given twice, the fingerprints of all secondary keys are listed too.
+ This command also forces pretty printing of fingerprints if the
+ keyid format has been set to "none".
+
+'--list-packets'
- List only the sequence of packets. This is mainly useful for
++ List only the sequence of packets. This command is only useful for
+ debugging. When used with option '--verbose' the actual MPI values
- are dumped and not only their lengths.
++ are dumped and not only their lengths. Note that the output of
++ this command may change with new releases.
+
+'--card-edit'
+ Present a menu to work with a smartcard. The subcommand "help"
+ provides an overview on available commands. For a detailed
+ description, please see the Card HOWTO at
+ https://gnupg.org/documentation/howtos.html#GnuPG-cardHOWTO .
+
+'--card-status'
+ Show the content of the smart card.
+
+'--change-pin'
+ Present a menu to allow changing the PIN of a smartcard. This
+ functionality is also available as the subcommand "passwd" with the
+ '--card-edit' command.
+
+'--delete-keys name'
+'--delete-keys name'
+ Remove key from the public keyring. In batch mode either '--yes'
+ is required or the key must be specified by fingerprint. This is a
+ safeguard against accidental deletion of multiple keys.
+
+'--delete-secret-keys name'
+ gRemove key from the secret keyring. In batch mode the key must be
+ specified by fingerprint. The option '--yes' can be used to advice
+ gpg-agent not to request a confirmation. This extra pre-caution is
+ done because 'gpg' can't be sure that the secret key (as controlled
+ by gpg-agent) is only used for the given OpenPGP public key.
+
+'--delete-secret-and-public-key name'
+ Same as '--delete-key', but if a secret key exists, it will be
+ removed first. In batch mode the key must be specified by
+ fingerprint. The option '--yes' can be used to advice gpg-agent
+ not to request a confirmation.
+
+'--export'
+ Either export all keys from all keyrings (default keyrings and
+ those registered via option '--keyring'), or if at least one name
+ is given, those of the given name. The exported keys are written
+ to STDOUT or to the file given with option '--output'. Use
+ together with '--armor' to mail those keys.
+
+'--send-keys key IDs'
+ Similar to '--export' but sends the keys to a keyserver.
+ Fingerprints may be used instead of key IDs. Option '--keyserver'
+ must be used to give the name of this keyserver. Don't send your
+ complete keyring to a keyserver -- select only those keys which are
+ new or changed by you. If no key IDs are given, 'gpg' does
+ nothing.
+
+'--export-secret-keys'
+'--export-secret-subkeys'
+ Same as '--export', but exports the secret keys instead. The
+ exported keys are written to STDOUT or to the file given with
+ option '--output'. This command is often used along with the
+ option '--armor' to allow easy printing of the key for paper
+ backup; however the external tool 'paperkey' does a better job for
+ creating backups on paper. Note that exporting a secret key can be
+ a security risk if the exported keys are send over an insecure
+ channel.
+
+ The second form of the command has the special property to render
+ the secret part of the primary key useless; this is a GNU extension
+ to OpenPGP and other implementations can not be expected to
+ successfully import such a key. Its intended use is to generated a
+ full key with an additional signing subkey on a dedicated machine
+ and then using this command to export the key without the primary
+ key to the main machine.
+
+ GnuPG may ask you to enter the passphrase for the key. This is
+ required because the internal protection method of the secret key
+ is different from the one specified by the OpenPGP protocol.
+
+'--export-ssh-key'
+ This command is used to export a key in the OpenSSH public key
+ format. It requires the specification of one key by the usual
+ means and exports the latest valid subkey which has an
+ authentication capability to STDOUT or to the file given with
+ option '--output'. That output can directly be added to ssh's
+ 'authorized_key' file.
+
+ By specifying the key to export using a key ID or a fingerprint
+ suffixed with an exclamation mark (!), a specific subkey or the
+ primary key can be exported. This does not even require that the
+ key has the authentication capability flag set.
+
+'--import'
+'--fast-import'
+ Import/merge keys. This adds the given keys to the keyring. The
+ fast version is currently just a synonym.
+
+ There are a few other options which control how this command works.
+ Most notable here is the '--import-options merge-only' option which
+ does not insert new keys but does only the merging of new
+ signatures, user-IDs and subkeys.
+
+'--recv-keys key IDs'
+ Import the keys with the given key IDs from a keyserver. Option
+ '--keyserver' must be used to give the name of this keyserver.
+
+'--refresh-keys'
+ Request updates from a keyserver for keys that already exist on the
+ local keyring. This is useful for updating a key with the latest
+ signatures, user IDs, etc. Calling this with no arguments will
+ refresh the entire keyring. Option '--keyserver' must be used to
+ give the name of the keyserver for all keys that do not have
+ preferred keyservers set (see '--keyserver-options
+ honor-keyserver-url').
+
+'--search-keys names'
+ Search the keyserver for the given names. Multiple names given
+ here will be joined together to create the search string for the
+ keyserver. Option '--keyserver' must be used to give the name of
+ this keyserver. Keyservers that support different search methods
+ allow using the syntax specified in "How to specify a user ID"
+ below. Note that different keyserver types support different
+ search methods. Currently only LDAP supports them all.
+
+'--fetch-keys URIs'
+ Retrieve keys located at the specified URIs. Note that different
+ installations of GnuPG may support different protocols (HTTP, FTP,
+ LDAP, etc.). When using HTTPS the system provided root
+ certificates are used by this command.
+
+'--update-trustdb'
+ Do trust database maintenance. This command iterates over all keys
+ and builds the Web of Trust. This is an interactive command
+ because it may have to ask for the "ownertrust" values for keys.
+ The user has to give an estimation of how far she trusts the owner
+ of the displayed key to correctly certify (sign) other keys. GnuPG
+ only asks for the ownertrust value if it has not yet been assigned
+ to a key. Using the '--edit-key' menu, the assigned value can be
+ changed at any time.
+
+'--check-trustdb'
+ Do trust database maintenance without user interaction. From time
+ to time the trust database must be updated so that expired keys or
+ signatures and the resulting changes in the Web of Trust can be
+ tracked. Normally, GnuPG will calculate when this is required and
+ do it automatically unless '--no-auto-check-trustdb' is set. This
+ command can be used to force a trust database check at any time.
+ The processing is identical to that of '--update-trustdb' but it
+ skips keys with a not yet defined "ownertrust".
+
+ For use with cron jobs, this command can be used together with
+ '--batch' in which case the trust database check is done only if a
+ check is needed. To force a run even in batch mode add the option
+ '--yes'.
+
+'--export-ownertrust'
+ Send the ownertrust values to STDOUT. This is useful for backup
+ purposes as these values are the only ones which can't be
+ re-created from a corrupted trustdb. Example:
+ gpg --export-ownertrust > otrust.txt
+
+'--import-ownertrust'
+ Update the trustdb with the ownertrust values stored in 'files' (or
+ STDIN if not given); existing values will be overwritten. In case
+ of a severely damaged trustdb and if you have a recent backup of
+ the ownertrust values (e.g. in the file 'otrust.txt', you may
+ re-create the trustdb using these commands:
+ cd ~/.gnupg
+ rm trustdb.gpg
+ gpg --import-ownertrust < otrust.txt
+
+'--rebuild-keydb-caches'
+ When updating from version 1.0.6 to 1.0.7 this command should be
+ used to create signature caches in the keyring. It might be handy
+ in other situations too.
+
+'--print-md algo'
+'--print-mds'
+ Print message digest of algorithm ALGO for all given files or
+ STDIN. With the second form (or a deprecated "*" as algo) digests
+ for all available algorithms are printed.
+
+'--gen-random 0|1|2 count'
+ Emit COUNT random bytes of the given quality level 0, 1 or 2. If
+ COUNT is not given or zero, an endless sequence of random bytes
+ will be emitted. If used with '--armor' the output will be base64
+ encoded. PLEASE, don't use this command unless you know what you
+ are doing; it may remove precious entropy from the system!
+
+'--gen-prime mode bits'
+ Use the source, Luke :-). The output format is still subject to
+ change.
+
+'--enarmor'
+'--dearmor'
+ Pack or unpack an arbitrary input into/from an OpenPGP ASCII armor.
+ This is a GnuPG extension to OpenPGP and in general not very
+ useful.
+
+'--tofu-policy auto|good|unknown|bad|ask key...'
+ Set the TOFU policy for all the bindings associated with the
+ specified keys. For more information about the meaning of the
+ policies, *note trust-model-tofu::. The keys may be specified
+ either by their fingerprint (preferred) or their keyid.
+
+
+File: gnupg.info, Node: OpenPGP Key Management, Prev: Operational GPG Commands, Up: GPG Commands
+
+4.1.3 How to manage your keys
+-----------------------------
+
+This section explains the main commands for key management
+
+'--quick-gen-key user-id [algo [usage [expire]]]'
+ This is a simple command to generate a standard key with one user
+ id. In contrast to '--gen-key' the key is generated directly
+ without the need to answer a bunch of prompts. Unless the option
+ '--yes' is given, the key creation will be canceled if the given
+ user id already exists in the key ring.
+
+ If invoked directly on the console without any special options an
+ answer to a "Continue?" style confirmation prompt is required. In
+ case the user id already exists in the key ring a second prompt to
+ force the creation of the key will show up.
+
+ If any of the optional arguments are given, only the primary key is
+ created and no prompts are shown. For a description of these
+ optional arguments see the command '--quick-addkey'. The 'usage'
+ accepts also the value "cert" which can be used to create a
+ certification only primary key; the default is to a create
+ certification and signing key.
+
+ If this command is used with '--batch', '--pinentry-mode' has been
+ set to 'loopback', and one of the passphrase options
+ ('--passphrase', '--passphrase-fd', or 'passphrase-file') is used,
+ the supplied passphrase is used for the new key and the agent does
+ not ask for it. To create a key without any protection
+ '--passphrase ''' may be used.
+
+'--quick-addkey fpr [algo [usage [expire]]]'
+ Directly add a subkey to the key identified by the fingerprint
+ 'fpr'. Without the optional arguments an encryption subkey is
+ added. If any of the arguments are given a more specific subkey is
+ added.
+
+ 'algo' may be any of the supported algorithms or curve names given
+ in the format as used by key listings. To use the default
+ algorithm the string "default" or "-" can be used. Supported
+ algorithms are "rsa", "dsa", "elg", "ed25519", "cv25519", and other
+ ECC curves. For example the string "rsa" adds an RSA key with the
+ default key length; a string "rsa4096" requests that the key length
+ is 4096 bits.
+
+ Depending on the given 'algo' the subkey may either be an
+ encryption subkey or a signing subkey. If an algorithm is capable
+ of signing and encryption and such a subkey is desired, a 'usage'
+ string must be given. This string is either "default" or "-" to
+ keep the default or a comma delimited list of keywords: "sign" for
+ a signing subkey, "auth" for an authentication subkey, and "encr"
+ for an encryption subkey ("encrypt" can be used as alias for
+ "encr"). The valid combinations depend on the algorithm.
+
+ The 'expire' argument can be used to specify an expiration date for
+ the subkey. Several formats are supported; commonly the ISO
+ YYYY-MM-DD format is used. The values "never", "none", or "-" can
+ be used for no expiration date.
+
+'--gen-key'
+ Generate a new key pair using the current default parameters. This
+ is the standard command to create a new key. In addition to the
+ key a revocation certificate is created and stored in the
+ 'openpgp-revocs.d' directory below the GnuPG home directory.
+
+'--full-gen-key'
+ Generate a new key pair with dialogs for all options. This is an
+ extended version of '--gen-key'.
+
+ There is also a feature which allows you to create keys in batch
+ mode. See the manual section "Unattended key generation" on how to
+ use this.
+
+'--gen-revoke name'
+ Generate a revocation certificate for the complete key. To only
+ revoke a subkey or a key signature, use the '--edit' command.
+
+ This command merely creates the revocation certificate so that it
+ can be used to revoke the key if that is ever needed. To actually
+ revoke a key the created revocation certificate needs to be merged
+ with the key to revoke. This is done by importing the revocation
+ certificate using the '--import' command. Then the revoked key
+ needs to be published, which is best done by sending the key to a
+ keyserver (command '--send-key') and by exporting ('--export') it
+ to a file which is then send to frequent communication partners.
+
+'--desig-revoke name'
+ Generate a designated revocation certificate for a key. This
+ allows a user (with the permission of the keyholder) to revoke
+ someone else's key.
+
+'--edit-key'
+ Present a menu which enables you to do most of the key management
+ related tasks. It expects the specification of a key on the
+ command line.
+
+ uid 'n'
+ Toggle selection of user ID or photographic user ID with index
+ 'n'. Use '*' to select all and '0' to deselect all.
+
+ key 'n'
+ Toggle selection of subkey with index 'n' or key ID 'n'. Use
+ '*' to select all and '0' to deselect all.
+
+ sign
+ Make a signature on key of user 'name' If the key is not yet
+ signed by the default user (or the users given with -u), the
+ program displays the information of the key again, together
+ with its fingerprint and asks whether it should be signed.
+ This question is repeated for all users specified with -u.
+
+ lsign
+ Same as "sign" but the signature is marked as non-exportable
+ and will therefore never be used by others. This may be used
+ to make keys valid only in the local environment.
+
+ nrsign
+ Same as "sign" but the signature is marked as non-revocable
+ and can therefore never be revoked.
+
+ tsign
+ Make a trust signature. This is a signature that combines the
+ notions of certification (like a regular signature), and trust
+ (like the "trust" command). It is generally only useful in
+ distinct communities or groups. For more information please
+ read the sections "Trust Signature" and "Regular Expression"
+ in RFC-4880.
+
+ Note that "l" (for local / non-exportable), "nr" (for
+ non-revocable, and "t" (for trust) may be freely mixed and prefixed
+ to "sign" to create a signature of any type desired.
+
+ If the option '--only-sign-text-ids' is specified, then any
+ non-text based user ids (e.g., photo IDs) will not be selected for
+ signing.
+
+ delsig
+ Delete a signature. Note that it is not possible to retract a
+ signature, once it has been send to the public (i.e. to a
+ keyserver). In that case you better use 'revsig'.
+
+ revsig
+ Revoke a signature. For every signature which has been
+ generated by one of the secret keys, GnuPG asks whether a
+ revocation certificate should be generated.
+
+ check
+ Check the signatures on all selected user IDs. With the extra
+ option 'selfsig' only self-signatures are shown.
+
+ adduid
+ Create an additional user ID.
+
+ addphoto
+ Create a photographic user ID. This will prompt for a JPEG
+ file that will be embedded into the user ID. Note that a very
+ large JPEG will make for a very large key. Also note that
+ some programs will display your JPEG unchanged (GnuPG), and
+ some programs will scale it to fit in a dialog box (PGP).
+
+ showphoto
+ Display the selected photographic user ID.
+
+ deluid
+ Delete a user ID or photographic user ID. Note that it is not
+ possible to retract a user id, once it has been send to the
+ public (i.e. to a keyserver). In that case you better use
+ 'revuid'.
+
+ revuid
+ Revoke a user ID or photographic user ID.
+
+ primary
+ Flag the current user id as the primary one, removes the
+ primary user id flag from all other user ids and sets the
+ timestamp of all affected self-signatures one second ahead.
+ Note that setting a photo user ID as primary makes it primary
+ over other photo user IDs, and setting a regular user ID as
+ primary makes it primary over other regular user IDs.
+
+ keyserver
+ Set a preferred keyserver for the specified user ID(s). This
+ allows other users to know where you prefer they get your key
+ from. See '--keyserver-options honor-keyserver-url' for more
+ on how this works. Setting a value of "none" removes an
+ existing preferred keyserver.
+
+ notation
+ Set a name=value notation for the specified user ID(s). See
+ '--cert-notation' for more on how this works. Setting a value
+ of "none" removes all notations, setting a notation prefixed
+ with a minus sign (-) removes that notation, and setting a
+ notation name (without the =value) prefixed with a minus sign
+ removes all notations with that name.
+
+ pref
+ List preferences from the selected user ID. This shows the
+ actual preferences, without including any implied preferences.
+
+ showpref
+ More verbose preferences listing for the selected user ID.
+ This shows the preferences in effect by including the implied
+ preferences of 3DES (cipher), SHA-1 (digest), and Uncompressed
+ (compression) if they are not already included in the
+ preference list. In addition, the preferred keyserver and
+ signature notations (if any) are shown.
+
+ setpref 'string'
+ Set the list of user ID preferences to 'string' for all (or
+ just the selected) user IDs. Calling setpref with no
+ arguments sets the preference list to the default (either
+ built-in or set via '--default-preference-list'), and calling
+ setpref with "none" as the argument sets an empty preference
+ list. Use 'gpg --version' to get a list of available
+ algorithms. Note that while you can change the preferences on
+ an attribute user ID (aka "photo ID"), GnuPG does not select
+ keys via attribute user IDs so these preferences will not be
+ used by GnuPG.
+
+ When setting preferences, you should list the algorithms in
+ the order which you'd like to see them used by someone else
+ when encrypting a message to your key. If you don't include
+ 3DES, it will be automatically added at the end. Note that
+ there are many factors that go into choosing an algorithm (for
+ example, your key may not be the only recipient), and so the
+ remote OpenPGP application being used to send to you may or
+ may not follow your exact chosen order for a given message.
+ It will, however, only choose an algorithm that is present on
+ the preference list of every recipient key. See also the
+ INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS section below.
+
+ addkey
+ Add a subkey to this key.
+
+ addcardkey
+ Generate a subkey on a card and add it to this key.
+
+ keytocard
+ Transfer the selected secret subkey (or the primary key if no
+ subkey has been selected) to a smartcard. The secret key in
+ the keyring will be replaced by a stub if the key could be
+ stored successfully on the card and you use the save command
+ later. Only certain key types may be transferred to the card.
+ A sub menu allows you to select on what card to store the key.
+ Note that it is not possible to get that key back from the
+ card - if the card gets broken your secret key will be lost
+ unless you have a backup somewhere.
+
+ bkuptocard 'file'
+ Restore the given file to a card. This command may be used to
+ restore a backup key (as generated during card initialization)
+ to a new card. In almost all cases this will be the
+ encryption key. You should use this command only with the
+ corresponding public key and make sure that the file given as
+ argument is indeed the backup to restore. You should then
+ select 2 to restore as encryption key. You will first be
+ asked to enter the passphrase of the backup key and then for
+ the Admin PIN of the card.
+
+ delkey
+ Remove a subkey (secondary key). Note that it is not possible
+ to retract a subkey, once it has been send to the public (i.e.
+ to a keyserver). In that case you better use 'revkey'.
+
+ revkey
+ Revoke a subkey.
+
+ expire
+ Change the key or subkey expiration time. If a subkey is
+ selected, the expiration time of this subkey will be changed.
+ With no selection, the key expiration of the primary key is
+ changed.
+
+ trust
+ Change the owner trust value for the key. This updates the
+ trust-db immediately and no save is required.
+
+ disable
+ enable
+ Disable or enable an entire key. A disabled key can not
+ normally be used for encryption.
+
+ addrevoker
+ Add a designated revoker to the key. This takes one optional
+ argument: "sensitive". If a designated revoker is marked as
+ sensitive, it will not be exported by default (see
+ export-options).
+
+ passwd
+ Change the passphrase of the secret key.
+
+ toggle
+ This is dummy command which exists only for backward
+ compatibility.
+
+ clean
+ Compact (by removing all signatures except the selfsig) any
+ user ID that is no longer usable (e.g. revoked, or expired).
+ Then, remove any signatures that are not usable by the trust
+ calculations. Specifically, this removes any signature that
+ does not validate, any signature that is superseded by a later
+ signature, revoked signatures, and signatures issued by keys
+ that are not present on the keyring.
+
+ minimize
+ Make the key as small as possible. This removes all
+ signatures from each user ID except for the most recent
+ self-signature.
+
+ cross-certify
+ Add cross-certification signatures to signing subkeys that may
+ not currently have them. Cross-certification signatures
+ protect against a subtle attack against signing subkeys. See
+ '--require-cross-certification'. All new keys generated have
+ this signature by default, so this option is only useful to
+ bring older keys up to date.
+
+ save
+ Save all changes to the key rings and quit.
+
+ quit
+ Quit the program without updating the key rings.
+
+ The listing shows you the key with its secondary keys and all user
+ ids. The primary user id is indicated by a dot, and selected keys
+ or user ids are indicated by an asterisk. The trust value is
+ displayed with the primary key: the first is the assigned owner
+ trust and the second is the calculated trust value. Letters are
+ used for the values:
+
+ -
+ No ownertrust assigned / not yet calculated.
+
+ e
+ Trust calculation has failed; probably due to an expired key.
+
+ q
+ Not enough information for calculation.
+
+ n
+ Never trust this key.
+
+ m
+ Marginally trusted.
+
+ f
+ Fully trusted.
+
+ u
+ Ultimately trusted.
+
+'--sign-key name'
+ Signs a public key with your secret key. This is a shortcut
+ version of the subcommand "sign" from '--edit'.
+
+'--lsign-key name'
+ Signs a public key with your secret key but marks it as
+ non-exportable. This is a shortcut version of the subcommand
+ "lsign" from '--edit-key'.
+
+'--quick-sign-key fpr [names]'
+'--quick-lsign-key fpr [names]'
+ Directly sign a key from the passphrase without any further user
+ interaction. The 'fpr' must be the verified primary fingerprint of
+ a key in the local keyring. If no 'names' are given, all useful
+ user ids are signed; with given ['names'] only useful user ids
+ matching one of theses names are signed. By default, or if a name
+ is prefixed with a '*', a case insensitive substring match is used.
+ If a name is prefixed with a '=' a case sensitive exact match is
+ done.
+
+ The command '--quick-lsign-key' marks the signatures as
+ non-exportable. If such a non-exportable signature already exists
+ the '--quick-sign-key' turns it into a exportable signature.
+
+ This command uses reasonable defaults and thus does not provide the
+ full flexibility of the "sign" subcommand from '--edit-key'. Its
+ intended use is to help unattended key signing by utilizing a list
+ of verified fingerprints.
+
+'--quick-adduid USER-ID NEW-USER-ID'
+ This command adds a new user id to an existing key. In contrast to
+ the interactive sub-command 'adduid' of '--edit-key' the
+ NEW-USER-ID is added verbatim with only leading and trailing white
+ space removed, it is expected to be UTF-8 encoded, and no checks on
+ its form are applied.
+
+'--quick-revuid USER-ID USER-ID-TO-REVOKE'
+ This command revokes a User ID on an existing key. It cannot be
+ used to revoke the last User ID on key (some non-revoked User ID
+ must remain), with revocation reason "User ID is no longer valid".
+ If you want to specify a different revocation reason, or to supply
+ supplementary revocation text, you should use the interactive
+ sub-command 'revuid' of '--edit-key'.
+
+'--passwd USER_ID'
+ Change the passphrase of the secret key belonging to the
+ certificate specified as USER_ID. This is a shortcut for the
+ sub-command 'passwd' of the edit key menu.
+
+
+File: gnupg.info, Node: GPG Options, Next: GPG Configuration, Prev: GPG Commands, Up: Invoking GPG
+
+4.2 Option Summary
+==================
+
+'gpg' features a bunch of options to control the exact behaviour and to
+change the default configuration.
+
+* Menu:
+
+* GPG Configuration Options:: How to change the configuration.
+* GPG Key related Options:: Key related options.
+* GPG Input and Output:: Input and Output.
+* OpenPGP Options:: OpenPGP protocol specific options.
+* Compliance Options:: Compliance options.
+* GPG Esoteric Options:: Doing things one usually don't want to do.
+* Deprecated Options:: Deprecated options.
+
+ Long options can be put in an options file (default
+"~/.gnupg/gpg.conf"). Short option names will not work - for example,
+"armor" is a valid option for the options file, while "a" is not. Do
+not write the 2 dashes, but simply the name of the option and any
+required arguments. Lines with a hash ('#') as the first
+non-white-space character are ignored. Commands may be put in this file
+too, but that is not generally useful as the command will execute
+automatically with every execution of gpg.
+
+ Please remember that option parsing stops as soon as a non-option is
+encountered, you can explicitly stop parsing by using the special option
+'--'.
+
+
+File: gnupg.info, Node: GPG Configuration Options, Next: GPG Key related Options, Up: GPG Options
+
+4.2.1 How to change the configuration
+-------------------------------------
+
+These options are used to change the configuration and are usually found
+in the option file.
+
+'--default-key NAME'
+ Use NAME as the default key to sign with. If this option is not
+ used, the default key is the first key found in the secret keyring.
+ Note that '-u' or '--local-user' overrides this option. This
+ option may be given multiple times. In this case, the last key for
+ which a secret key is available is used. If there is no secret key
+ available for any of the specified values, GnuPG will not emit an
+ error message but continue as if this option wasn't given.
+
+'--default-recipient NAME'
+ Use NAME as default recipient if option '--recipient' is not used
+ and don't ask if this is a valid one. NAME must be non-empty.
+
+'--default-recipient-self'
+ Use the default key as default recipient if option '--recipient' is
+ not used and don't ask if this is a valid one. The default key is
+ the first one from the secret keyring or the one set with
+ '--default-key'.
+
+'--no-default-recipient'
+ Reset '--default-recipient' and '--default-recipient-self'.
+
+'-v, --verbose'
+ Give more information during processing. If used twice, the input
+ data is listed in detail.
+
+'--no-verbose'
+ Reset verbose level to 0.
+
+'-q, --quiet'
+ Try to be as quiet as possible.
+
+'--batch'
+'--no-batch'
+ Use batch mode. Never ask, do not allow interactive commands.
+ '--no-batch' disables this option. Note that even with a filename
+ given on the command line, gpg might still need to read from STDIN
+ (in particular if gpg figures that the input is a detached
+ signature and no data file has been specified). Thus if you do not
+ want to feed data via STDIN, you should connect STDIN to
+ '/dev/null'.
+
+'--no-tty'
+ Make sure that the TTY (terminal) is never used for any output.
+ This option is needed in some cases because GnuPG sometimes prints
+ warnings to the TTY even if '--batch' is used.
+
+'--yes'
+ Assume "yes" on most questions.
+
+'--no'
+ Assume "no" on most questions.
+
+'--list-options parameters'
+ This is a space or comma delimited string that gives options used
+ when listing keys and signatures (that is, '--list-keys',
+ '--list-sigs', '--list-public-keys', '--list-secret-keys', and the
+ '--edit-key' functions). Options can be prepended with a 'no-'
+ (after the two dashes) to give the opposite meaning. The options
+ are:
+
+ show-photos
+ Causes '--list-keys', '--list-sigs', '--list-public-keys', and
+ '--list-secret-keys' to display any photo IDs attached to the
+ key. Defaults to no. See also '--photo-viewer'. Does not
+ work with '--with-colons': see '--attribute-fd' for the
+ appropriate way to get photo data for scripts and other
+ frontends.
+
+ show-usage
+ Show usage information for keys and subkeys in the standard
+ key listing. This is a list of letters indicating the allowed
+ usage for a key ('E'=encryption, 'S'=signing,
+ 'C'=certification, 'A'=authentication). Defaults to yes.
+
+ show-policy-urls
+ Show policy URLs in the '--list-sigs' or '--check-sigs'
+ listings. Defaults to no.
+
+ show-notations
+ show-std-notations
+ show-user-notations
+ Show all, IETF standard, or user-defined signature notations
+ in the '--list-sigs' or '--check-sigs' listings. Defaults to
+ no.
+
+ show-keyserver-urls
+ Show any preferred keyserver URL in the '--list-sigs' or
+ '--check-sigs' listings. Defaults to no.
+
+ show-uid-validity
+ Display the calculated validity of user IDs during key
+ listings. Defaults to yes.
+
+ show-unusable-uids
+ Show revoked and expired user IDs in key listings. Defaults
+ to no.
+
+ show-unusable-subkeys
+ Show revoked and expired subkeys in key listings. Defaults to
+ no.
+
+ show-keyring
+ Display the keyring name at the head of key listings to show
+ which keyring a given key resides on. Defaults to no.
+
+ show-sig-expire
+ Show signature expiration dates (if any) during '--list-sigs'
+ or '--check-sigs' listings. Defaults to no.
+
+ show-sig-subpackets
+ Include signature subpackets in the key listing. This option
+ can take an optional argument list of the subpackets to list.
+ If no argument is passed, list all subpackets. Defaults to
+ no. This option is only meaningful when using '--with-colons'
+ along with '--list-sigs' or '--check-sigs'.
+
+'--verify-options parameters'
+ This is a space or comma delimited string that gives options used
+ when verifying signatures. Options can be prepended with a 'no-'
+ to give the opposite meaning. The options are:
+
+ show-photos
+ Display any photo IDs present on the key that issued the
+ signature. Defaults to no. See also '--photo-viewer'.
+
+ show-policy-urls
+ Show policy URLs in the signature being verified. Defaults to
+ yes.
+
+ show-notations
+ show-std-notations
+ show-user-notations
+ Show all, IETF standard, or user-defined signature notations
+ in the signature being verified. Defaults to IETF standard.
+
+ show-keyserver-urls
+ Show any preferred keyserver URL in the signature being
+ verified. Defaults to yes.
+
+ show-uid-validity
+ Display the calculated validity of the user IDs on the key
+ that issued the signature. Defaults to yes.
+
+ show-unusable-uids
+ Show revoked and expired user IDs during signature
+ verification. Defaults to no.
+
+ show-primary-uid-only
+ Show only the primary user ID during signature verification.
+ That is all the AKA lines as well as photo Ids are not shown
+ with the signature verification status.
+
+ pka-lookups
+ Enable PKA lookups to verify sender addresses. Note that PKA
+ is based on DNS, and so enabling this option may disclose
+ information on when and what signatures are verified or to
+ whom data is encrypted. This is similar to the "web bug"
+ described for the '--auto-key-retrieve' option.
+
+ pka-trust-increase
+ Raise the trust in a signature to full if the signature passes
+ PKA validation. This option is only meaningful if pka-lookups
+ is set.
+
+'--enable-large-rsa'
+'--disable-large-rsa'
+ With -gen-key and -batch, enable the creation of RSA secret keys as
+ large as 8192 bit. Note: 8192 bit is more than is generally
+ recommended. These large keys don't significantly improve
+ security, but they are more expensive to use, and their signatures
+ and certifications are larger. This option is only available if
+ the binary was build with large-secmem support.
+
+'--enable-dsa2'
+'--disable-dsa2'
+ Enable hash truncation for all DSA keys even for old DSA Keys up to
+ 1024 bit. This is also the default with '--openpgp'. Note that
+ older versions of GnuPG also required this flag to allow the
+ generation of DSA larger than 1024 bit.
+
+'--photo-viewer string'
+ This is the command line that should be run to view a photo ID.
+ "%i" will be expanded to a filename containing the photo. "%I"
+ does the same, except the file will not be deleted once the viewer
+ exits. Other flags are "%k" for the key ID, "%K" for the long key
+ ID, "%f" for the key fingerprint, "%t" for the extension of the
+ image type (e.g. "jpg"), "%T" for the MIME type of the image (e.g.
+ "image/jpeg"), "%v" for the single-character calculated validity of
+ the image being viewed (e.g. "f"), "%V" for the calculated
+ validity as a string (e.g. "full"), "%U" for a base32 encoded hash
+ of the user ID, and "%%" for an actual percent sign. If neither %i
+ or %I are present, then the photo will be supplied to the viewer on
+ standard input.
+
+ The default viewer is "xloadimage -fork -quiet -title 'KeyID 0x%k'
+ STDIN". Note that if your image viewer program is not secure, then
+ executing it from GnuPG does not make it secure.
+
+'--exec-path string'
+ Sets a list of directories to search for photo viewers and
+ keyserver helpers. If not provided, keyserver helpers use the
+ compiled-in default directory, and photo viewers use the 'PATH'
+ environment variable. Note, that on W32 system this value is
+ ignored when searching for keyserver helpers.
+
+'--keyring file'
+ Add 'file' to the current list of keyrings. If 'file' begins with
+ a tilde and a slash, these are replaced by the $HOME directory. If
+ the filename does not contain a slash, it is assumed to be in the
+ GnuPG home directory ("~/.gnupg" if '--homedir' or $GNUPGHOME is
+ not used).
+
+ Note that this adds a keyring to the current list. If the intent
+ is to use the specified keyring alone, use '--keyring' along with
+ '--no-default-keyring'.
+
+ If the the option '--no-keyring' has been used no keyrings will be
+ used at all.
+
+'--secret-keyring file'
+ This is an obsolete option and ignored. All secret keys are stored
+ in the 'private-keys-v1.d' directory below the GnuPG home
+ directory.
+
+'--primary-keyring file'
+ Designate 'file' as the primary public keyring. This means that
+ newly imported keys (via '--import' or keyserver '--recv-from')
+ will go to this keyring.
+
+'--trustdb-name file'
+ Use 'file' instead of the default trustdb. If 'file' begins with a
+ tilde and a slash, these are replaced by the $HOME directory. If
+ the filename does not contain a slash, it is assumed to be in the
+ GnuPG home directory ('~/.gnupg' if '--homedir' or $GNUPGHOME is
+ not used).
+
+'--homedir DIR'
+ Set the name of the home directory to DIR. If this option is not
+ used, the home directory defaults to '~/.gnupg'. It is only
+ recognized when given on the command line. It also overrides any
+ home directory stated through the environment variable 'GNUPGHOME'
+ or (on Windows systems) by means of the Registry entry
+ HKCU\SOFTWARE\GNU\GNUPG:HOMEDIR.
+
+ On Windows systems it is possible to install GnuPG as a portable
+ application. In this case only this command line option is
+ considered, all other ways to set a home directory are ignored.
+
+ To install GnuPG as a portable application under Windows, create an
+ empty file name 'gpgconf.ctl' in the same directory as the tool
+ 'gpgconf.exe'. The root of the installation is than that
+ directory; or, if 'gpgconf.exe' has been installed directly below a
+ directory named 'bin', its parent directory. You also need to make
+ sure that the following directories exist and are writable:
+ 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ for internal cache files.
+
+'--display-charset name'
+ Set the name of the native character set. This is used to convert
+ some informational strings like user IDs to the proper UTF-8
+ encoding. Note that this has nothing to do with the character set
+ of data to be encrypted or signed; GnuPG does not recode
+ user-supplied data. If this option is not used, the default
+ character set is determined from the current locale. A verbosity
+ level of 3 shows the chosen set. Valid values for 'name' are:
+
+ iso-8859-1
+ This is the Latin 1 set.
+
+ iso-8859-2
+ The Latin 2 set.
+
+ iso-8859-15
+ This is currently an alias for the Latin 1 set.
+
+ koi8-r
+ The usual Russian set (rfc1489).
+
+ utf-8
+ Bypass all translations and assume that the OS uses native
+ UTF-8 encoding.
+
+'--utf8-strings'
+'--no-utf8-strings'
+ Assume that command line arguments are given as UTF8 strings. The
+ default ('--no-utf8-strings') is to assume that arguments are
+ encoded in the character set as specified by '--display-charset'.
+ These options affect all following arguments. Both options may be
+ used multiple times.
+
+'--options file'
+ Read options from 'file' and do not try to read them from the
+ default options file in the homedir (see '--homedir'). This option
+ is ignored if used in an options file.
+
+'--no-options'
+ Shortcut for '--options /dev/null'. This option is detected before
+ an attempt to open an option file. Using this option will also
+ prevent the creation of a '~/.gnupg' homedir.
+
+'-z n'
+'--compress-level n'
+'--bzip2-compress-level n'
+ Set compression level to 'n' for the ZIP and ZLIB compression
+ algorithms. The default is to use the default compression level of
+ zlib (normally 6). '--bzip2-compress-level' sets the compression
+ level for the BZIP2 compression algorithm (defaulting to 6 as
+ well). This is a different option from '--compress-level' since
+ BZIP2 uses a significant amount of memory for each additional
+ compression level. '-z' sets both. A value of 0 for 'n' disables
+ compression.
+
+'--bzip2-decompress-lowmem'
+ Use a different decompression method for BZIP2 compressed files.
+ This alternate method uses a bit more than half the memory, but
+ also runs at half the speed. This is useful under extreme low
+ memory circumstances when the file was originally compressed at a
+ high '--bzip2-compress-level'.
+
+'--mangle-dos-filenames'
+'--no-mangle-dos-filenames'
+ Older version of Windows cannot handle filenames with more than one
+ dot. '--mangle-dos-filenames' causes GnuPG to replace (rather than
+ add to) the extension of an output filename to avoid this problem.
+ This option is off by default and has no effect on non-Windows
+ platforms.
+
+'--ask-cert-level'
+'--no-ask-cert-level'
+ When making a key signature, prompt for a certification level. If
+ this option is not specified, the certification level used is set
+ via '--default-cert-level'. See '--default-cert-level' for
+ information on the specific levels and how they are used.
+ '--no-ask-cert-level' disables this option. This option defaults
+ to no.
+
+'--default-cert-level n'
+ The default to use for the check level when signing a key.
+
+ 0 means you make no particular claim as to how carefully you
+ verified the key.
+
+ 1 means you believe the key is owned by the person who claims to
+ own it but you could not, or did not verify the key at all. This
+ is useful for a "persona" verification, where you sign the key of a
+ pseudonymous user.
+
+ 2 means you did casual verification of the key. For example, this
+ could mean that you verified the key fingerprint and checked the
+ user ID on the key against a photo ID.
+
+ 3 means you did extensive verification of the key. For example,
+ this could mean that you verified the key fingerprint with the
+ owner of the key in person, and that you checked, by means of a
+ hard to forge document with a photo ID (such as a passport) that
+ the name of the key owner matches the name in the user ID on the
+ key, and finally that you verified (by exchange of email) that the
+ email address on the key belongs to the key owner.
+
+ Note that the examples given above for levels 2 and 3 are just
+ that: examples. In the end, it is up to you to decide just what
+ "casual" and "extensive" mean to you.
+
+ This option defaults to 0 (no particular claim).
+
+'--min-cert-level'
+ When building the trust database, treat any signatures with a
+ certification level below this as invalid. Defaults to 2, which
+ disregards level 1 signatures. Note that level 0 "no particular
+ claim" signatures are always accepted.
+
+'--trusted-key long key ID'
+ Assume that the specified key (which must be given as a full 8 byte
+ key ID) is as trustworthy as one of your own secret keys. This
+ option is useful if you don't want to keep your secret keys (or one
+ of them) online but still want to be able to check the validity of
+ a given recipient's or signator's key.
+
+'--trust-model pgp|classic|tofu|tofu+pgp|direct|always|auto'
+ Set what trust model GnuPG should follow. The models are:
+
+ pgp
+ This is the Web of Trust combined with trust signatures as
+ used in PGP 5.x and later. This is the default trust model
+ when creating a new trust database.
+
+ classic
+ This is the standard Web of Trust as introduced by PGP 2.
+
+ tofu
+ TOFU stands for Trust On First Use. In this trust model, the
+ first time a key is seen, it is memorized. If later another
+ key is seen with a user id with the same email address, a
+ warning is displayed indicating that there is a conflict and
+ that the key might be a forgery and an attempt at a
+ man-in-the-middle attack.
+
+ Because a potential attacker is able to control the email
+ address and thereby circumvent the conflict detection
+ algorithm by using an email address that is similar in
+ appearance to a trusted email address, whenever a message is
+ verified, statistics about the number of messages signed with
+ the key are shown. In this way, a user can easily identify
+ attacks using fake keys for regular correspondents.
+
+ When compared with the Web of Trust, TOFU offers significantly
+ weaker security guarantees. In particular, TOFU only helps
+ ensure consistency (that is, that the binding between a key
+ and email address doesn't change). A major advantage of TOFU
+ is that it requires little maintenance to use correctly. To
+ use the web of trust properly, you need to actively sign keys
+ and mark users as trusted introducers. This is a
+ time-consuming process and anecdotal evidence suggests that
+ even security-conscious users rarely take the time to do this
+ thoroughly and instead rely on an ad-hoc TOFU process.
+
+ In the TOFU model, policies are associated with bindings
+ between keys and email addresses (which are extracted from
+ user ids and normalized). There are five policies, which can
+ be set manually using the '--tofu-policy' option. The default
+ policy can be set using the '--tofu-default-policy' policy.
+
+ The TOFU policies are: 'auto', 'good', 'unknown', 'bad' and
+ 'ask'. The 'auto' policy is used by default (unless
+ overridden by '--tofu-default-policy') and marks a binding as
+ marginally trusted. The 'good', 'unknown' and 'bad' policies
+ mark a binding as fully trusted, as having unknown trust or as
+ having trust never, respectively. The 'unknown' policy is
+ useful for just using TOFU to detect conflicts, but to never
+ assign positive trust to a binding. The final policy, 'ask'
+ prompts the user to indicate the binding's trust. If batch
+ mode is enabled (or input is inappropriate in the context),
+ then the user is not prompted and the 'undefined' trust level
+ is returned.
+
+ tofu+pgp
+ This trust model combines TOFU with the Web of Trust. This is
+ done by computing the trust level for each model and then
+ taking the maximum trust level where the trust levels are
+ ordered as follows: 'unknown < undefined < marginal < fully <
+ ultimate < expired < never'.
+
+ By setting '--tofu-default-policy=unknown', this model can be
+ used to implement the web of trust with TOFU's conflict
+ detection algorithm, but without its assignment of positive
+ trust values, which some security-conscious users don't like.
+
+ direct
+ Key validity is set directly by the user and not calculated
+ via the Web of Trust.
+
+ always
+ Skip key validation and assume that used keys are always fully
+ valid. You generally won't use this unless you are using some
+ external validation scheme. This option also suppresses the
+ "[uncertain]" tag printed with signature checks when there is
+ no evidence that the user ID is bound to the key. Note that
+ this trust model still does not allow the use of expired,
+ revoked, or disabled keys.
+
+ auto
+ Select the trust model depending on whatever the internal
+ trust database says. This is the default model if such a
+ database already exists.
+
+'--auto-key-locate parameters'
+'--no-auto-key-locate'
+ GnuPG can automatically locate and retrieve keys as needed using
+ this option. This happens when encrypting to an email address (in
+ the "user at example.com" form), and there are no user at example.com
+ keys on the local keyring. This option takes any number of the
+ following mechanisms, in the order they are to be tried:
+
+ cert
+ Locate a key using DNS CERT, as specified in rfc4398.
+
+ pka
+ Locate a key using DNS PKA.
+
+ dane
+ Locate a key using DANE, as specified in
+ draft-ietf-dane-openpgpkey-05.txt.
+
+ wkd
+ Locate a key using the Web Key Directory protocol. This is an
+ experimental method and semantics may change.
+
+ ldap
+ Using DNS Service Discovery, check the domain in question for
+ any LDAP keyservers to use. If this fails, attempt to locate
+ the key using the PGP Universal method of checking
+ 'ldap://keys.(thedomain)'.
+
+ keyserver
+ Locate a key using whatever keyserver is defined using the
+ '--keyserver' option.
+
+ keyserver-URL
+ In addition, a keyserver URL as used in the '--keyserver'
+ option may be used here to query that particular keyserver.
+
+ local
+ Locate the key using the local keyrings. This mechanism
- allows to select the order a local key lookup is done. Thus
- using '--auto-key-locate local' is identical to
++ allows the user to select the order a local key lookup is
++ done. Thus using '--auto-key-locate local' is identical to
+ '--no-auto-key-locate'.
+
+ nodefault
+ This flag disables the standard local key lookup, done before
+ any of the mechanisms defined by the '--auto-key-locate' are
+ tried. The position of this mechanism in the list does not
+ matter. It is not required if 'local' is also used.
+
+ clear
+ Clear all defined mechanisms. This is useful to override
+ mechanisms given in a config file.
+
+'--auto-key-retrieve'
+'--no-auto-key-retrieve'
+ This option enables the automatic retrieving of keys from a
+ keyserver when verifying signatures made by keys that are not on
+ the local keyring.
+
+ If the method "wkd" is included in the list of methods given to
+ 'auto-key-locate', the Signer's User ID is part of the signature,
+ and the option '--disable-signer-uid' is not used, the "wkd" method
+ may also be used to retrieve a key.
+
+ Note that this option makes a "web bug" like behavior possible.
+ Keyserver or Web Key Directory operators can see which keys you
+ request, so by sending you a message signed by a brand new key
+ (which you naturally will not have on your local keyring), the
+ operator can tell both your IP address and the time when you
+ verified the signature.
+
+'--keyid-format none|short|0xshort|long|0xlong'
+ Select how to display key IDs. "none" does not show the key ID at
+ all but shows the fingerprint in a separate line. "short" is the
+ traditional 8-character key ID. "long" is the more accurate (but
+ less convenient) 16-character key ID. Add an "0x" to either to
+ include an "0x" at the beginning of the key ID, as in 0x99242560.
+ Note that this option is ignored if the option '--with-colons' is
+ used.
+
+'--keyserver name'
+ This option is deprecated - please use the '--keyserver' in
+ 'dirmngr.conf' instead.
+
+ Use 'name' as your keyserver. This is the server that
+ '--recv-keys', '--send-keys', and '--search-keys' will communicate
+ with to receive keys from, send keys to, and search for keys on.
+ The format of the 'name' is a URI:
+ 'scheme:[//]keyservername[:port]' The scheme is the type of
+ keyserver: "hkp" for the HTTP (or compatible) keyservers, "ldap"
+ for the LDAP keyservers, or "mailto" for the Graff email keyserver.
+ Note that your particular installation of GnuPG may have other
+ keyserver types available as well. Keyserver schemes are
+ case-insensitive. After the keyserver name, optional keyserver
+ configuration options may be provided. These are the same as the
+ global '--keyserver-options' from below, but apply only to this
+ particular keyserver.
+
+ Most keyservers synchronize with each other, so there is generally
+ no need to send keys to more than one server. The keyserver
+ 'hkp://keys.gnupg.net' uses round robin DNS to give a different
+ keyserver each time you use it.
+
+'--keyserver-options name=value'
+ This is a space or comma delimited string that gives options for
+ the keyserver. Options can be prefixed with a 'no-' to give the
+ opposite meaning. Valid import-options or export-options may be
+ used here as well to apply to importing ('--recv-key') or exporting
+ ('--send-key') a key from a keyserver. While not all options are
+ available for all keyserver types, some common options are:
+
+ include-revoked
+ When searching for a key with '--search-keys', include keys
+ that are marked on the keyserver as revoked. Note that not
+ all keyservers differentiate between revoked and unrevoked
+ keys, and for such keyservers this option is meaningless.
+ Note also that most keyservers do not have cryptographic
+ verification of key revocations, and so turning this option
+ off may result in skipping keys that are incorrectly marked as
+ revoked.
+
+ include-disabled
+ When searching for a key with '--search-keys', include keys
+ that are marked on the keyserver as disabled. Note that this
+ option is not used with HKP keyservers.
+
+ auto-key-retrieve
+ This is the same as the option 'auto-key-retrieve'.
+
+ honor-keyserver-url
+ When using '--refresh-keys', if the key in question has a
+ preferred keyserver URL, then use that preferred keyserver to
+ refresh the key from. In addition, if auto-key-retrieve is
+ set, and the signature being verified has a preferred
+ keyserver URL, then use that preferred keyserver to fetch the
+ key from. Note that this option introduces a "web bug": The
+ creator of the key can see when the keys is refreshed. Thus
+ this option is not enabled by default.
+
+ honor-pka-record
+ If '--auto-key-retrieve' is used, and the signature being
+ verified has a PKA record, then use the PKA information to
+ fetch the key. Defaults to "yes".
+
+ include-subkeys
+ When receiving a key, include subkeys as potential targets.
+ Note that this option is not used with HKP keyservers, as they
+ do not support retrieving keys by subkey id.
+
+ timeout
+ Tell the keyserver helper program how long (in seconds) to try
+ and perform a keyserver action before giving up. Note that
+ performing multiple actions at the same time uses this timeout
+ value per action. For example, when retrieving multiple keys
+ via '--recv-keys', the timeout applies separately to each key
+ retrieval, and not to the '--recv-keys' command as a whole.
+ Defaults to 30 seconds.
+
+ http-proxy='value'
+ This options is deprecated. Set the proxy to use for HTTP and
+ HKP keyservers. This overrides any proxy defined in
+ 'dirmngr.conf'.
+
+ verbose
+ This option has no more function since GnuPG 2.1. Use the
+ 'dirmngr' configuration options instead.
+
+ debug
+ This option has no more function since GnuPG 2.1. Use the
+ 'dirmngr' configuration options instead.
+
+ check-cert
+ This option has no more function since GnuPG 2.1. Use the
+ 'dirmngr' configuration options instead.
+
+ ca-cert-file
+ This option has no more function since GnuPG 2.1. Use the
+ 'dirmngr' configuration options instead.
+
+'--completes-needed n'
+ Number of completely trusted users to introduce a new key signer
+ (defaults to 1).
+
+'--marginals-needed n'
+ Number of marginally trusted users to introduce a new key signer
+ (defaults to 3)
+
+'--tofu-default-policy auto|good|unknown|bad|ask'
+ The default TOFU policy (defaults to 'auto'). For more information
+ about the meaning of this option, *Note trust-model-tofu::.
+
- '--tofu-db-format auto|split|flat'
- The format for the TOFU DB.
-
- The split file format splits the data across many DBs under the
- 'tofu.d' directory (one per email address and one per key). This
- makes it easier to automatically synchronize the data using a tool
- such as Unison (<https://www.cis.upenn.edu/~bcpierce/unison/>),
- since the individual files change rarely.
-
- The flat file format keeps all of the data in the single file
- 'tofu.db'. This format results in better performance.
-
- If set to auto (which is the default), GnuPG will first check for
- the existence of 'tofu.d' and 'tofu.db'. If one of these exists,
- the corresponding format is used. If neither or both of these
- exist, then GnuPG defaults to the 'split' format. In the latter
- case, a warning is emitted.
-
+'--max-cert-depth n'
+ Maximum depth of a certification chain (default is 5).
+
+'--no-sig-cache'
+ Do not cache the verification status of key signatures. Caching
+ gives a much better performance in key listings. However, if you
+ suspect that your public keyring is not save against write
+ modifications, you can use this option to disable the caching. It
+ probably does not make sense to disable it because all kind of
+ damage can be done if someone else has write access to your public
+ keyring.
+
+'--auto-check-trustdb'
+'--no-auto-check-trustdb'
+ If GnuPG feels that its information about the Web of Trust has to
+ be updated, it automatically runs the '--check-trustdb' command
+ internally. This may be a time consuming process.
+ '--no-auto-check-trustdb' disables this option.
+
+'--use-agent'
+'--no-use-agent'
+ This is dummy option. 'gpg' always requires the agent.
+
+'--gpg-agent-info'
+ This is dummy option. It has no effect when used with 'gpg'.
+
+'--agent-program FILE'
+ Specify an agent program to be used for secret key operations. The
+ default value is determined by running 'gpgconf' with the option
+ '--list-dirs'. Note that the pipe symbol ('|') is used for a
+ regression test suite hack and may thus not be used in the file
+ name.
+
+'--dirmngr-program FILE'
+ Specify a dirmngr program to be used for keyserver access. The
+ default value is '/usr/local/bin/dirmngr'.
+
+'--no-autostart'
+ Do not start the gpg-agent or the dirmngr if it has not yet been
+ started and its service is required. This option is mostly useful
+ on machines where the connection to gpg-agent has been redirected
+ to another machines. If dirmngr is required on the remote machine,
+ it may be started manually using 'gpgconf --launch dirmngr'.
+
+'--lock-once'
+ Lock the databases the first time a lock is requested and do not
+ release the lock until the process terminates.
+
+'--lock-multiple'
+ Release the locks every time a lock is no longer needed. Use this
+ to override a previous '--lock-once' from a config file.
+
+'--lock-never'
+ Disable locking entirely. This option should be used only in very
+ special environments, where it can be assured that only one process
+ is accessing those files. A bootable floppy with a stand-alone
+ encryption system will probably use this. Improper usage of this
+ option may lead to data and key corruption.
+
+'--exit-on-status-write-error'
+ This option will cause write errors on the status FD to immediately
+ terminate the process. That should in fact be the default but it
+ never worked this way and thus we need an option to enable this, so
+ that the change won't break applications which close their end of a
+ status fd connected pipe too early. Using this option along with
+ '--enable-progress-filter' may be used to cleanly cancel long
+ running gpg operations.
+
+'--limit-card-insert-tries n'
+ With 'n' greater than 0 the number of prompts asking to insert a
+ smartcard gets limited to N-1. Thus with a value of 1 gpg won't at
+ all ask to insert a card if none has been inserted at startup.
+ This option is useful in the configuration file in case an
+ application does not know about the smartcard support and waits ad
+ infinitum for an inserted card.
+
+'--no-random-seed-file'
+ GnuPG uses a file to store its internal random pool over
+ invocations. This makes random generation faster; however
+ sometimes write operations are not desired. This option can be
+ used to achieve that with the cost of slower random generation.
+
+'--no-greeting'
+ Suppress the initial copyright message.
+
+'--no-secmem-warning'
+ Suppress the warning about "using insecure memory".
+
+'--no-permission-warning'
+ Suppress the warning about unsafe file and home directory
+ ('--homedir') permissions. Note that the permission checks that
+ GnuPG performs are not intended to be authoritative, but rather
+ they simply warn about certain common permission problems. Do not
+ assume that the lack of a warning means that your system is secure.
+
+ Note that the warning for unsafe '--homedir' permissions cannot be
+ suppressed in the gpg.conf file, as this would allow an attacker to
+ place an unsafe gpg.conf file in place, and use this file to
+ suppress warnings about itself. The '--homedir' permissions
+ warning may only be suppressed on the command line.
+
+'--no-mdc-warning'
+ Suppress the warning about missing MDC integrity protection.
+
+'--require-secmem'
+'--no-require-secmem'
+ Refuse to run if GnuPG cannot get secure memory. Defaults to no
+ (i.e. run, but give a warning).
+
+'--require-cross-certification'
+'--no-require-cross-certification'
+ When verifying a signature made from a subkey, ensure that the
+ cross certification "back signature" on the subkey is present and
+ valid. This protects against a subtle attack against subkeys that
+ can sign. Defaults to '--require-cross-certification' for 'gpg'.
+
+'--expert'
+'--no-expert'
+ Allow the user to do certain nonsensical or "silly" things like
+ signing an expired or revoked key, or certain potentially
+ incompatible things like generating unusual key types. This also
+ disables certain warning messages about potentially incompatible
+ actions. As the name implies, this option is for experts only. If
+ you don't fully understand the implications of what it allows you
+ to do, leave this off. '--no-expert' disables this option.
+
+
+File: gnupg.info, Node: GPG Key related Options, Next: GPG Input and Output, Prev: GPG Configuration Options, Up: GPG Options
+
+4.2.2 Key related options
+-------------------------
+
+'--recipient NAME'
+'-r'
+ Encrypt for user id NAME. If this option or '--hidden-recipient'
+ is not specified, GnuPG asks for the user-id unless
+ '--default-recipient' is given.
+
+'--hidden-recipient NAME'
+'-R'
+ Encrypt for user ID NAME, but hide the key ID of this user's key.
+ This option helps to hide the receiver of the message and is a
+ limited countermeasure against traffic analysis. If this option or
+ '--recipient' is not specified, GnuPG asks for the user ID unless
+ '--default-recipient' is given.
+
+'--recipient-file FILE'
+'-f'
+ This option is similar to '--recipient' except that it encrypts to
+ a key stored in the given file. FILE must be the name of a file
+ containing exactly one key. 'gpg' assumes that the key in this
+ file is fully valid.
+
+'--hidden-recipient-file FILE'
+'-F'
+ This option is similar to '--hidden-recipient' except that it
+ encrypts to a key stored in the given file. FILE must be the name
+ of a file containing exactly one key. 'gpg' assumes that the key
+ in this file is fully valid.
+
+'--encrypt-to name'
+ Same as '--recipient' but this one is intended for use in the
+ options file and may be used with your own user-id as an
+ "encrypt-to-self". These keys are only used when there are other
+ recipients given either by use of '--recipient' or by the asked
+ user id. No trust checking is performed for these user ids and
+ even disabled keys can be used.
+
+'--hidden-encrypt-to name'
+ Same as '--hidden-recipient' but this one is intended for use in
+ the options file and may be used with your own user-id as a hidden
+ "encrypt-to-self". These keys are only used when there are other
+ recipients given either by use of '--recipient' or by the asked
+ user id. No trust checking is performed for these user ids and
+ even disabled keys can be used.
+
+'--no-encrypt-to'
+ Disable the use of all '--encrypt-to' and '--hidden-encrypt-to'
+ keys.
+
+'--group name=value1 '
+ Sets up a named group, which is similar to aliases in email
+ programs. Any time the group name is a recipient ('-r' or
+ '--recipient'), it will be expanded to the values specified.
+ Multiple groups with the same name are automatically merged into a
+ single group.
+
+ The values are 'key IDs' or fingerprints, but any key description
+ is accepted. Note that a value with spaces in it will be treated
+ as two different values. Note also there is only one level of
+ expansion -- you cannot make an group that points to another group.
+ When used from the command line, it may be necessary to quote the
+ argument to this option to prevent the shell from treating it as
+ multiple arguments.
+
+'--ungroup name'
+ Remove a given entry from the '--group' list.
+
+'--no-groups'
+ Remove all entries from the '--group' list.
+
+'--local-user NAME'
+'-u'
+ Use NAME as the key to sign with. Note that this option overrides
+ '--default-key'.
+
++'--sender MBOX'
++ This option has two purposes. MBOX must either be a complete user
++ id with a proper mail address or just a mail address. When
++ creating a signature this option tells gpg the user id of a key
++ used to make a signature if the key was not directly specified by a
++ user id. When verifying a signature the MBOX is used to restrict
++ the information printed by the TOFU code to matching user ids.
++
+'--try-secret-key NAME'
+ For hidden recipients GPG needs to know the keys to use for trial
+ decryption. The key set with '--default-key' is always tried
- first, but this is often not sufficient. This option allows to set
- more keys to be used for trial decryption. Although any valid
- user-id specification may be used for NAME it makes sense to use at
- least the long keyid to avoid ambiguities. Note that gpg-agent
- might pop up a pinentry for a lot keys to do the trial decryption.
- If you want to stop all further trial decryption you may use
- close-window button instead of the cancel button.
++ first, but this is often not sufficient. This option allows
++ setting more keys to be used for trial decryption. Although any
++ valid user-id specification may be used for NAME it makes sense to
++ use at least the long keyid to avoid ambiguities. Note that
++ gpg-agent might pop up a pinentry for a lot keys to do the trial
++ decryption. If you want to stop all further trial decryption you
++ may use close-window button instead of the cancel button.
+
+'--try-all-secrets'
+ Don't look at the key ID as stored in the message but try all
+ secret keys in turn to find the right decryption key. This option
+ forces the behaviour as used by anonymous recipients (created by
+ using '--throw-keyids' or '--hidden-recipient') and might come
+ handy in case where an encrypted message contains a bogus key ID.
+
+'--skip-hidden-recipients'
+'--no-skip-hidden-recipients'
+ During decryption skip all anonymous recipients. This option helps
+ in the case that people use the hidden recipients feature to hide
+ there own encrypt-to key from others. If oneself has many secret
+ keys this may lead to a major annoyance because all keys are tried
+ in turn to decrypt something which was not really intended for it.
+ The drawback of this option is that it is currently not possible to
+ decrypt a message which includes real anonymous recipients.
+
+
+File: gnupg.info, Node: GPG Input and Output, Next: OpenPGP Options, Prev: GPG Key related Options, Up: GPG Options
+
+4.2.3 Input and Output
+----------------------
+
+'--armor'
+'-a'
+ Create ASCII armored output. The default is to create the binary
+ OpenPGP format.
+
+'--no-armor'
+ Assume the input data is not in ASCII armored format.
+
+'--output FILE'
+'-o FILE'
+ Write output to FILE.
+
+'--max-output n'
+ This option sets a limit on the number of bytes that will be
+ generated when processing a file. Since OpenPGP supports various
+ levels of compression, it is possible that the plaintext of a given
+ message may be significantly larger than the original OpenPGP
+ message. While GnuPG works properly with such messages, there is
+ often a desire to set a maximum file size that will be generated
+ before processing is forced to stop by the OS limits. Defaults to
+ 0, which means "no limit".
+
++'--input-size-hint N'
++ This option can be used to tell GPG the size of the input data in
++ bytes. N must be a positive base-10 number. This option is only
++ useful if the input is not taken from a file. GPG may use thos
++ hint to optimize its buffer allocation strategy. It is also used
++ by the '--status-fd' line "PROGRESS" to provide a value for "total"
++ if that is not available by other means.
++
+'--import-options parameters'
+ This is a space or comma delimited string that gives options for
+ importing keys. Options can be prepended with a 'no-' to give the
+ opposite meaning. The options are:
+
+ import-local-sigs
+ Allow importing key signatures marked as "local". This is not
+ generally useful unless a shared keyring scheme is being used.
+ Defaults to no.
+
+ keep-ownertrust
+ Normally possible still existing ownertrust values of a key
+ are cleared if a key is imported. This is in general
+ desirable so that a formerly deleted key does not
+ automatically gain an ownertrust values merely due to import.
+ On the other hand it is sometimes necessary to re-import a
+ trusted set of keys again but keeping already assigned
+ ownertrust values. This can be achived by using this option.
+
+ repair-pks-subkey-bug
+ During import, attempt to repair the damage caused by the PKS
+ keyserver bug (pre version 0.9.6) that mangles keys with
+ multiple subkeys. Note that this cannot completely repair the
+ damaged key as some crucial data is removed by the keyserver,
+ but it does at least give you back one subkey. Defaults to no
+ for regular '--import' and to yes for keyserver '--recv-keys'.
+
+ import-show
+ Show a listing of the key as imported right before it is
+ stored. This can be combined with the option '--dry-run' to
+ only look at keys.
+
+ import-export
+ Run the entire import code but instead of storing the key to
+ the local keyring write it to the output. The export options
+ 'export-pka' and 'export-dane' affect the output. This option
+ can be used to remove all invalid parts from a key without the
+ need to store it.
+
+ merge-only
+ During import, allow key updates to existing keys, but do not
+ allow any new keys to be imported. Defaults to no.
+
+ import-clean
+ After import, compact (remove all signatures except the
+ self-signature) any user IDs from the new key that are not
+ usable. Then, remove any signatures from the new key that are
+ not usable. This includes signatures that were issued by keys
+ that are not present on the keyring. This option is the same
+ as running the '--edit-key' command "clean" after import.
+ Defaults to no.
+
+ import-minimal
+ Import the smallest key possible. This removes all signatures
+ except the most recent self-signature on each user ID. This
+ option is the same as running the '--edit-key' command
+ "minimize" after import. Defaults to no.
+
+'--import-filter NAME=EXPR'
+'--export-filter NAME=EXPR'
+ These options define an import/export filter which are applied to
+ the imported/exported keyblock right before it will be
+ stored/written. NAME defines the type of filter to use, EXPR the
+ expression to evaluate. The option can be used several times which
+ then appends more expression to the same NAME.
+
+ The available filter types are:
+
+ keep-uid
+ This filter will keep a user id packet and its dependent
+ packets in the keyblock if the expression evaluates to true.
+
++ drop-sig
++ This filter drops the selected key signatures on user ids.
++ Self-signatures are not consideres. Currently only
++ implemented for -import-filter.
++
+ For the syntax of the expression see the chapter "FILTER
+ EXPRESSIONS". The property names for the expressions depend on the
+ actual filter type and are indicated in the following table.
+
+ The available properties are:
+
+ uid
+ A string with the user id. (keep-uid)
+
+ mbox
+ The addr-spec part of a user id with mailbox or the empty
+ string. (keep-uid)
+
+ primary
+ Boolean indicating whether the user id is the primary one.
+ (keep-uid)
+
++ sig_created
++ sig_created_d
++ The first is the timestamp a signature packet was created.
++ The second is the same but given as an ISO string, e.g.
++ "2016-08-17". (drop-sig)
++
++ sig_algo
++ A number with the public key algorithm of a signature packet.
++ (drop-sig)
++
++ sig_digest_algo
++ A number with the digest algorithm of a signature packet.
++ (drop-sig)
++
+'--export-options parameters'
+ This is a space or comma delimited string that gives options for
+ exporting keys. Options can be prepended with a 'no-' to give the
+ opposite meaning. The options are:
+
+ export-local-sigs
+ Allow exporting key signatures marked as "local". This is not
+ generally useful unless a shared keyring scheme is being used.
+ Defaults to no.
+
+ export-attributes
+ Include attribute user IDs (photo IDs) while exporting. This
+ is useful to export keys if they are going to be used by an
+ OpenPGP program that does not accept attribute user IDs.
+ Defaults to yes.
+
+ export-sensitive-revkeys
+ Include designated revoker information that was marked as
+ "sensitive". Defaults to no.
+
+ export-clean
+ Compact (remove all signatures from) user IDs on the key being
+ exported if the user IDs are not usable. Also, do not export
+ any signatures that are not usable. This includes signatures
+ that were issued by keys that are not present on the keyring.
+ This option is the same as running the '--edit-key' command
+ "clean" before export except that the local copy of the key is
+ not modified. Defaults to no.
+
+ export-minimal
+ Export the smallest key possible. This removes all signatures
+ except the most recent self-signature on each user ID. This
+ option is the same as running the '--edit-key' command
+ "minimize" before export except that the local copy of the key
+ is not modified. Defaults to no.
+
+ export-pka
+ Instead of outputting the key material output PKA records
+ suitable to put into DNS zone files. An ORIGIN line is
+ printed before each record to allow diverting the records to
+ the corresponding zone file.
+
+ export-dane
+ Instead of outputting the key material output OpenPGP DANE
+ records suitable to put into DNS zone files. An ORIGIN line
+ is printed before each record to allow diverting the records
+ to the corresponding zone file.
+
+'--with-colons'
+ Print key listings delimited by colons. Note that the output will
+ be encoded in UTF-8 regardless of any '--display-charset' setting.
+ This format is useful when GnuPG is called from scripts and other
+ programs as it is easily machine parsed. The details of this
+ format are documented in the file 'doc/DETAILS', which is included
+ in the GnuPG source distribution.
+
+'--fixed-list-mode'
+ Do not merge primary user ID and primary key in '--with-colon'
+ listing mode and print all timestamps as seconds since 1970-01-01.
+ Since GnuPG 2.0.10, this mode is always used and thus this option
+ is obsolete; it does not harm to use it though.
+
+'--legacy-list-mode'
+ Revert to the pre-2.1 public key list mode. This only affects the
+ human readable output and not the machine interface (i.e.
- '--with-colons'). Note that the legacy format does not allow to
- convey suitable information for elliptic curves.
++ '--with-colons'). Note that the legacy format does not convey
++ suitable information for elliptic curves.
+
+'--with-fingerprint'
+ Same as the command '--fingerprint' but changes only the format of
+ the output and may be used together with another command.
+
+'--with-subkey-fingerprint'
+ If a fingerprint is printed for the primary key, this option forces
+ printing of the fingerprint for all subkeys. This could also be
+ achieved by using the '--with-fingerprint' twice but by using this
+ option along with keyid-format "none" a compact fingerprint is
+ printed.
+
+'--with-icao-spelling'
+ Print the ICAO spelling of the fingerprint in addition to the hex
+ digits.
+
+'--with-keygrip'
- Include the keygrip in the key listings.
++ Include the keygrip in the key listings. In '--with-colons' mode
++ this is implicitly enable for secret keys.
+
+'--with-wkd-hash'
+ Print a Web Key Directory indentifier along with each user ID in
+ key listings. This is an experimental feature and semantics may
+ change.
+
+'--with-secret'
+ Include info about the presence of a secret key in public key
+ listings done with '--with-colons'.
+
+
+File: gnupg.info, Node: OpenPGP Options, Next: Compliance Options, Prev: GPG Input and Output, Up: GPG Options
+
+4.2.4 OpenPGP protocol specific options.
+----------------------------------------
+
+'-t, --textmode'
+'--no-textmode'
+ Treat input files as text and store them in the OpenPGP canonical
+ text form with standard "CRLF" line endings. This also sets the
+ necessary flags to inform the recipient that the encrypted or
+ signed data is text and may need its line endings converted back to
+ whatever the local system uses. This option is useful when
+ communicating between two platforms that have different line ending
+ conventions (UNIX-like to Mac, Mac to Windows, etc).
+ '--no-textmode' disables this option, and is the default.
+
+'--force-v3-sigs'
+'--no-force-v3-sigs'
+'--force-v4-certs'
+'--no-force-v4-certs'
+ These options are obsolete and have no effect since GnuPG 2.1.
+
+'--force-mdc'
+ Force the use of encryption with a modification detection code.
+ This is always used with the newer ciphers (those with a blocksize
+ greater than 64 bits), or if all of the recipient keys indicate MDC
+ support in their feature flags.
+
+'--disable-mdc'
+ Disable the use of the modification detection code. Note that by
+ using this option, the encrypted message becomes vulnerable to a
+ message modification attack.
+
+'--disable-signer-uid'
+ By default the user ID of the signing key is embedded in the data
+ signature. As of now this is only done if the signing key has been
+ specified with 'local-user' using a mail address. This information
+ can be helpful for verifier to locate the key; see option
+ '--auto-key-retrieve'.
+
+'--personal-cipher-preferences string'
+ Set the list of personal cipher preferences to 'string'. Use 'gpg
+ --version' to get a list of available algorithms, and use 'none' to
+ set no preference at all. This allows the user to safely override
+ the algorithm chosen by the recipient key preferences, as GPG will
+ only select an algorithm that is usable by all recipients. The
+ most highly ranked cipher in this list is also used for the
+ '--symmetric' encryption command.
+
+'--personal-digest-preferences string'
+ Set the list of personal digest preferences to 'string'. Use 'gpg
+ --version' to get a list of available algorithms, and use 'none' to
+ set no preference at all. This allows the user to safely override
+ the algorithm chosen by the recipient key preferences, as GPG will
+ only select an algorithm that is usable by all recipients. The
+ most highly ranked digest algorithm in this list is also used when
+ signing without encryption (e.g. '--clearsign' or '--sign').
+
+'--personal-compress-preferences string'
+ Set the list of personal compression preferences to 'string'. Use
+ 'gpg --version' to get a list of available algorithms, and use
+ 'none' to set no preference at all. This allows the user to safely
+ override the algorithm chosen by the recipient key preferences, as
+ GPG will only select an algorithm that is usable by all recipients.
+ The most highly ranked compression algorithm in this list is also
+ used when there are no recipient keys to consider (e.g.
+ '--symmetric').
+
+'--s2k-cipher-algo name'
+ Use 'name' as the cipher algorithm for symmetric encryption with a
+ passphrase if '--personal-cipher-preferences' and '--cipher-algo'
+ are not given. The default is AES-128.
+
+'--s2k-digest-algo name'
+ Use 'name' as the digest algorithm used to mangle the passphrases
+ for symmetric encryption. The default is SHA-1.
+
+'--s2k-mode n'
+ Selects how passphrases for symmetric encryption are mangled. If
+ 'n' is 0 a plain passphrase (which is in general not recommended)
+ will be used, a 1 adds a salt (which should not be used) to the
+ passphrase and a 3 (the default) iterates the whole process a
+ number of times (see '--s2k-count').
+
+'--s2k-count n'
+ Specify how many times the passphrases mangling for symmetric
+ encryption is repeated. This value may range between 1024 and
+ 65011712 inclusive. The default is inquired from gpg-agent. Note
+ that not all values in the 1024-65011712 range are legal and if an
+ illegal value is selected, GnuPG will round up to the nearest legal
+ value. This option is only meaningful if '--s2k-mode' is set to
+ the default of 3.
+
+
+File: gnupg.info, Node: Compliance Options, Next: GPG Esoteric Options, Prev: OpenPGP Options, Up: GPG Options
+
+4.2.5 Compliance options
+------------------------
+
+These options control what GnuPG is compliant to. Only one of these
+options may be active at a time. Note that the default setting of this
+is nearly always the correct one. See the INTEROPERABILITY WITH OTHER
+OPENPGP PROGRAMS section below before using one of these options.
+
+'--gnupg'
+ Use standard GnuPG behavior. This is essentially OpenPGP behavior
+ (see '--openpgp'), but with some additional workarounds for common
+ compatibility problems in different versions of PGP. This is the
+ default option, so it is not generally needed, but it may be useful
+ to override a different compliance option in the gpg.conf file.
+
+'--openpgp'
+ Reset all packet, cipher and digest options to strict OpenPGP
+ behavior. Use this option to reset all previous options like
+ '--s2k-*', '--cipher-algo', '--digest-algo' and '--compress-algo'
+ to OpenPGP compliant values. All PGP workarounds are disabled.
+
+'--rfc4880'
+ Reset all packet, cipher and digest options to strict RFC-4880
+ behavior. Note that this is currently the same thing as
+ '--openpgp'.
+
+'--rfc4880bis'
+ Enable experimental features from proposed updates to RFC-4880.
+ This option can be used in addition to the other compliance
+ options. Warning: The behavior may change with any GnuPG release
+ and created keys or data may not be usable with future GnuPG
+ versions.
+
+'--rfc2440'
+ Reset all packet, cipher and digest options to strict RFC-2440
+ behavior.
+
+'--pgp6'
+ Set up all options to be as PGP 6 compliant as possible. This
+ restricts you to the ciphers IDEA (if the IDEA plugin is
+ installed), 3DES, and CAST5, the hashes MD5, SHA1 and RIPEMD160,
+ and the compression algorithms none and ZIP. This also disables
+ -throw-keyids, and making signatures with signing subkeys as PGP 6
+ does not understand signatures made by signing subkeys.
+
+ This option implies '--disable-mdc --escape-from-lines'.
+
+'--pgp7'
+ Set up all options to be as PGP 7 compliant as possible. This is
+ identical to '--pgp6' except that MDCs are not disabled, and the
+ list of allowable ciphers is expanded to add AES128, AES192,
+ AES256, and TWOFISH.
+
+'--pgp8'
+ Set up all options to be as PGP 8 compliant as possible. PGP 8 is
+ a lot closer to the OpenPGP standard than previous versions of PGP,
+ so all this does is disable '--throw-keyids' and set
+ '--escape-from-lines'. All algorithms are allowed except for the
+ SHA224, SHA384, and SHA512 digests.
+
+
+File: gnupg.info, Node: GPG Esoteric Options, Next: Deprecated Options, Prev: Compliance Options, Up: GPG Options
+
+4.2.6 Doing things one usually doesn't want to do.
+--------------------------------------------------
+
+'-n'
+'--dry-run'
+ Don't make any changes (this is not completely implemented).
+
+'--list-only'
+ Changes the behaviour of some commands. This is like '--dry-run'
+ but different in some cases. The semantic of this command may be
+ extended in the future. Currently it only skips the actual
+ decryption pass and therefore enables a fast listing of the
+ encryption keys.
+
+'-i'
+'--interactive'
+ Prompt before overwriting any files.
+
+'--debug-level LEVEL'
+ Select the debug level for investigating problems. LEVEL may be a
+ numeric value or by a keyword:
+
+ 'none'
+ No debugging at all. A value of less than 1 may be used
+ instead of the keyword.
+ 'basic'
+ Some basic debug messages. A value between 1 and 2 may be
+ used instead of the keyword.
+ 'advanced'
+ More verbose debug messages. A value between 3 and 5 may be
+ used instead of the keyword.
+ 'expert'
+ Even more detailed messages. A value between 6 and 8 may be
+ used instead of the keyword.
+ 'guru'
+ All of the debug messages you can get. A value greater than 8
+ may be used instead of the keyword. The creation of hash
+ tracing files is only enabled if the keyword is used.
+
+ How these messages are mapped to the actual debugging flags is not
+ specified and may change with newer releases of this program. They
+ are however carefully selected to best aid in debugging.
+
+'--debug FLAGS'
+ Set debugging flags. All flags are or-ed and FLAGS may be given in
+ C syntax (e.g. 0x0042) or as a comma separated list of flag names.
+ To get a list of all supported flags the single word "help" can be
+ used.
+
+'--debug-all'
+ Set all useful debugging flags.
+
+'--debug-iolbf'
+ Set stdout into line buffered mode. This option is only honored
+ when given on the command line.
+
+'--faked-system-time EPOCH'
+ This option is only useful for testing; it sets the system time
+ back or forth to EPOCH which is the number of seconds elapsed since
+ the year 1970. Alternatively EPOCH may be given as a full ISO time
+ string (e.g. "20070924T154812").
+
+'--enable-progress-filter'
+ Enable certain PROGRESS status outputs. This option allows
+ frontends to display a progress indicator while gpg is processing
+ larger files. There is a slight performance overhead using it.
+
+'--status-fd n'
+ Write special status strings to the file descriptor 'n'. See the
+ file DETAILS in the documentation for a listing of them.
+
+'--status-file file'
+ Same as '--status-fd', except the status data is written to file
+ 'file'.
+
+'--logger-fd n'
+ Write log output to file descriptor 'n' and not to STDERR.
+
+'--log-file file'
+'--logger-file file'
+ Same as '--logger-fd', except the logger data is written to file
+ 'file'. Note that '--log-file' is only implemented for GnuPG-2.
+
+'--attribute-fd n'
+ Write attribute subpackets to the file descriptor 'n'. This is
+ most useful for use with '--status-fd', since the status messages
+ are needed to separate out the various subpackets from the stream
+ delivered to the file descriptor.
+
+'--attribute-file file'
+ Same as '--attribute-fd', except the attribute data is written to
+ file 'file'.
+
+'--comment string'
+'--no-comments'
+ Use 'string' as a comment string in clear text signatures and ASCII
+ armored messages or keys (see '--armor'). The default behavior is
+ not to use a comment string. '--comment' may be repeated multiple
+ times to get multiple comment strings. '--no-comments' removes all
+ comments. It is a good idea to keep the length of a single comment
+ below 60 characters to avoid problems with mail programs wrapping
+ such lines. Note that comment lines, like all other header lines,
+ are not protected by the signature.
+
+'--emit-version'
+'--no-emit-version'
+ Force inclusion of the version string in ASCII armored output. If
+ given once only the name of the program and the major number is
- emitted (default), given twice the minor is also emitted, given
- triple the micro is added, and given quad an operating system
- identification is also emitted. '--no-emit-version' disables the
++ emitted, given twice the minor is also emitted, given triple the
++ micro is added, and given quad an operating system identification
++ is also emitted. '--no-emit-version' (default) disables the
+ version line.
+
+'--sig-notation name=value'
+'--cert-notation name=value'
+'-N, --set-notation name=value'
+ Put the name value pair into the signature as notation data.
+ 'name' must consist only of printable characters or spaces, and
+ must contain a '@' character in the form keyname at domain.example.com
+ (substituting the appropriate keyname and domain name, of course).
+ This is to help prevent pollution of the IETF reserved notation
+ namespace. The '--expert' flag overrides the '@' check. 'value'
+ may be any printable string; it will be encoded in UTF8, so you
+ should check that your '--display-charset' is set correctly. If
+ you prefix 'name' with an exclamation mark (!), the notation data
+ will be flagged as critical (rfc4880:5.2.3.16). '--sig-notation'
+ sets a notation for data signatures. '--cert-notation' sets a
+ notation for key signatures (certifications). '--set-notation'
+ sets both.
+
+ There are special codes that may be used in notation names. "%k"
+ will be expanded into the key ID of the key being signed, "%K" into
+ the long key ID of the key being signed, "%f" into the fingerprint
+ of the key being signed, "%s" into the key ID of the key making the
+ signature, "%S" into the long key ID of the key making the
+ signature, "%g" into the fingerprint of the key making the
+ signature (which might be a subkey), "%p" into the fingerprint of
+ the primary key of the key making the signature, "%c" into the
+ signature count from the OpenPGP smartcard, and "%%" results in a
+ single "%". %k, %K, and %f are only meaningful when making a key
+ signature (certification), and %c is only meaningful when using the
+ OpenPGP smartcard.
+
+'--sig-policy-url string'
+'--cert-policy-url string'
+'--set-policy-url string'
+ Use 'string' as a Policy URL for signatures (rfc4880:5.2.3.20). If
+ you prefix it with an exclamation mark (!), the policy URL packet
+ will be flagged as critical. '--sig-policy-url' sets a policy url
+ for data signatures. '--cert-policy-url' sets a policy url for key
+ signatures (certifications). '--set-policy-url' sets both.
+
+ The same %-expandos used for notation data are available here as
+ well.
+
+'--sig-keyserver-url string'
+ Use 'string' as a preferred keyserver URL for data signatures. If
+ you prefix it with an exclamation mark (!), the keyserver URL
+ packet will be flagged as critical.
+
+ The same %-expandos used for notation data are available here as
+ well.
+
+'--set-filename string'
+ Use 'string' as the filename which is stored inside messages. This
+ overrides the default, which is to use the actual filename of the
+ file being encrypted. Using the empty string for STRING
+ effectively removes the filename from the output.
+
+'--for-your-eyes-only'
+'--no-for-your-eyes-only'
+ Set the 'for your eyes only' flag in the message. This causes
+ GnuPG to refuse to save the file unless the '--output' option is
+ given, and PGP to use a "secure viewer" with a claimed
+ Tempest-resistant font to display the message. This option
+ overrides '--set-filename'. '--no-for-your-eyes-only' disables
+ this option.
+
+'--use-embedded-filename'
+'--no-use-embedded-filename'
+ Try to create a file with a name as embedded in the data. This can
- be a dangerous option as it allows to overwrite files. Defaults to
++ be a dangerous option as it enables overwriting files. Defaults to
+ no.
+
+'--cipher-algo name'
+ Use 'name' as cipher algorithm. Running the program with the
+ command '--version' yields a list of supported algorithms. If this
+ is not used the cipher algorithm is selected from the preferences
+ stored with the key. In general, you do not want to use this
+ option as it allows you to violate the OpenPGP standard.
+ '--personal-cipher-preferences' is the safe way to accomplish the
+ same thing.
+
+'--digest-algo name'
+ Use 'name' as the message digest algorithm. Running the program
+ with the command '--version' yields a list of supported algorithms.
+ In general, you do not want to use this option as it allows you to
+ violate the OpenPGP standard. '--personal-digest-preferences' is
+ the safe way to accomplish the same thing.
+
+'--compress-algo name'
+ Use compression algorithm 'name'. "zlib" is RFC-1950 ZLIB
+ compression. "zip" is RFC-1951 ZIP compression which is used by
+ PGP. "bzip2" is a more modern compression scheme that can compress
+ some things better than zip or zlib, but at the cost of more memory
+ used during compression and decompression. "uncompressed" or
+ "none" disables compression. If this option is not used, the
+ default behavior is to examine the recipient key preferences to see
+ which algorithms the recipient supports. If all else fails, ZIP is
+ used for maximum compatibility.
+
+ ZLIB may give better compression results than ZIP, as the
+ compression window size is not limited to 8k. BZIP2 may give even
+ better compression results than that, but will use a significantly
+ larger amount of memory while compressing and decompressing. This
+ may be significant in low memory situations. Note, however, that
+ PGP (all versions) only supports ZIP compression. Using any
+ algorithm other than ZIP or "none" will make the message unreadable
+ with PGP. In general, you do not want to use this option as it
+ allows you to violate the OpenPGP standard.
+ '--personal-compress-preferences' is the safe way to accomplish the
+ same thing.
+
+'--cert-digest-algo name'
+ Use 'name' as the message digest algorithm used when signing a key.
+ Running the program with the command '--version' yields a list of
+ supported algorithms. Be aware that if you choose an algorithm
+ that GnuPG supports but other OpenPGP implementations do not, then
+ some users will not be able to use the key signatures you make, or
+ quite possibly your entire key.
+
+'--disable-cipher-algo name'
+ Never allow the use of 'name' as cipher algorithm. The given name
+ will not be checked so that a later loaded algorithm will still get
+ disabled.
+
+'--disable-pubkey-algo name'
+ Never allow the use of 'name' as public key algorithm. The given
+ name will not be checked so that a later loaded algorithm will
+ still get disabled.
+
+'--throw-keyids'
+'--no-throw-keyids'
+ Do not put the recipient key IDs into encrypted messages. This
+ helps to hide the receivers of the message and is a limited
+ countermeasure against traffic analysis.(1) On the receiving side,
+ it may slow down the decryption process because all available
+ secret keys must be tried. '--no-throw-keyids' disables this
+ option. This option is essentially the same as using
+ '--hidden-recipient' for all recipients.
+
+'--not-dash-escaped'
+ This option changes the behavior of cleartext signatures so that
+ they can be used for patch files. You should not send such an
+ armored file via email because all spaces and line endings are
+ hashed too. You can not use this option for data which has 5
+ dashes at the beginning of a line, patch files don't have this. A
+ special armor header line tells GnuPG about this cleartext
+ signature option.
+
+'--escape-from-lines'
+'--no-escape-from-lines'
+ Because some mailers change lines starting with "From " to ">From "
+ it is good to handle such lines in a special way when creating
+ cleartext signatures to prevent the mail system from breaking the
+ signature. Note that all other PGP versions do it this way too.
+ Enabled by default. '--no-escape-from-lines' disables this option.
+
+'--passphrase-repeat n'
+ Specify how many times 'gpg' will request a new passphrase be
+ repeated. This is useful for helping memorize a passphrase.
+ Defaults to 1 repetition.
+
+'--passphrase-fd n'
+ Read the passphrase from file descriptor 'n'. Only the first line
+ will be read from file descriptor 'n'. If you use 0 for 'n', the
+ passphrase will be read from STDIN. This can only be used if only
+ one passphrase is supplied.
+
+ Note that this passphrase is only used if the option '--batch' has
+ also been given. This is different from GnuPG version 1.x.
+
+'--passphrase-file file'
+ Read the passphrase from file 'file'. Only the first line will be
+ read from file 'file'. This can only be used if only one
+ passphrase is supplied. Obviously, a passphrase stored in a file
+ is of questionable security if other users can read this file.
+ Don't use this option if you can avoid it. Note that this
+ passphrase is only used if the option '--batch' has also been
+ given. This is different from GnuPG version 1.x.
+
+'--passphrase string'
+ Use 'string' as the passphrase. This can only be used if only one
+ passphrase is supplied. Obviously, this is of very questionable
+ security on a multi-user system. Don't use this option if you can
+ avoid it. Note that this passphrase is only used if the option
+ '--batch' has also been given. This is different from GnuPG
+ version 1.x.
+
+'--pinentry-mode mode'
+ Set the pinentry mode to 'mode'. Allowed values for 'mode' are:
+ default
+ Use the default of the agent, which is 'ask'.
+ ask
+ Force the use of the Pinentry.
+ cancel
+ Emulate use of Pinentry's cancel button.
+ error
+ Return a Pinentry error ("No Pinentry").
+ loopback
+ Redirect Pinentry queries to the caller. Note that in
+ contrast to Pinentry the user is not prompted again if he
+ enters a bad password.
+
+'--command-fd n'
+ This is a replacement for the deprecated shared-memory IPC mode.
+ If this option is enabled, user input on questions is not expected
+ from the TTY but from the given file descriptor. It should be used
+ together with '--status-fd'. See the file doc/DETAILS in the
+ source distribution for details on how to use it.
+
+'--command-file file'
+ Same as '--command-fd', except the commands are read out of file
+ 'file'
+
+'--allow-non-selfsigned-uid'
+'--no-allow-non-selfsigned-uid'
+ Allow the import and use of keys with user IDs which are not
+ self-signed. This is not recommended, as a non self-signed user ID
+ is trivial to forge. '--no-allow-non-selfsigned-uid' disables.
+
+'--allow-freeform-uid'
+ Disable all checks on the form of the user ID while generating a
+ new one. This option should only be used in very special
+ environments as it does not ensure the de-facto standard format of
+ user IDs.
+
+'--ignore-time-conflict'
+ GnuPG normally checks that the timestamps associated with keys and
+ signatures have plausible values. However, sometimes a signature
+ seems to be older than the key due to clock problems. This option
+ makes these checks just a warning. See also '--ignore-valid-from'
+ for timestamp issues on subkeys.
+
+'--ignore-valid-from'
+ GnuPG normally does not select and use subkeys created in the
+ future. This option allows the use of such keys and thus exhibits
+ the pre-1.0.7 behaviour. You should not use this option unless
+ there is some clock problem. See also '--ignore-time-conflict' for
+ timestamp issues with signatures.
+
+'--ignore-crc-error'
+ The ASCII armor used by OpenPGP is protected by a CRC checksum
+ against transmission errors. Occasionally the CRC gets mangled
+ somewhere on the transmission channel but the actual content (which
+ is protected by the OpenPGP protocol anyway) is still okay. This
+ option allows GnuPG to ignore CRC errors.
+
+'--ignore-mdc-error'
+ This option changes a MDC integrity protection failure into a
+ warning. This can be useful if a message is partially corrupt, but
+ it is necessary to get as much data as possible out of the corrupt
+ message. However, be aware that a MDC protection failure may also
+ mean that the message was tampered with intentionally by an
+ attacker.
+
+'--allow-weak-digest-algos'
+ Signatures made with known-weak digest algorithms are normally
+ rejected with an "invalid digest algorithm" message. This option
+ allows the verification of signatures made with such weak
+ algorithms. MD5 is the only digest algorithm considered weak by
+ default. See also '--weak-digest' to reject other digest
+ algorithms.
+
+'--weak-digest name'
+ Treat the specified digest algorithm as weak. Signatures made over
+ weak digests algorithms are normally rejected. This option can be
+ supplied multiple times if multiple algorithms should be considered
+ weak. See also '--allow-weak-digest-algos' to disable rejection of
+ weak digests. MD5 is always considered weak, and does not need to
+ be listed explicitly.
+
+'--no-default-keyring'
+ Do not add the default keyrings to the list of keyrings. Note that
+ GnuPG will not operate without any keyrings, so if you use this
+ option and do not provide alternate keyrings via '--keyring' or
+ '--secret-keyring', then GnuPG will still use the default public or
+ secret keyrings.
+
+'--no-keyring'
+ Do not add use any keyrings even if specified as options.
+
+'--skip-verify'
+ Skip the signature verification step. This may be used to make the
+ decryption faster if the signature verification is not needed.
+
+'--with-key-data'
+ Print key listings delimited by colons (like '--with-colons') and
+ print the public key data.
+
+'--fast-list-mode'
+ Changes the output of the list commands to work faster; this is
+ achieved by leaving some parts empty. Some applications don't need
+ the user ID and the trust information given in the listings. By
+ using this options they can get a faster listing. The exact
+ behaviour of this option may change in future versions. If you are
+ missing some information, don't use this option.
+
+'--no-literal'
+ This is not for normal use. Use the source to see for what it
+ might be useful.
+
+'--set-filesize'
+ This is not for normal use. Use the source to see for what it
+ might be useful.
+
+'--show-session-key'
+ Display the session key used for one message. See
+ '--override-session-key' for the counterpart of this option.
+
+ We think that Key Escrow is a Bad Thing; however the user should
+ have the freedom to decide whether to go to prison or to reveal the
+ content of one specific message without compromising all messages
+ ever encrypted for one secret key.
+
+ You can also use this option if you receive an encrypted message
+ which is abusive or offensive, to prove to the administrators of
+ the messaging system that the ciphertext transmitted corresponds to
+ an inappropriate plaintext so they can take action against the
+ offending user.
+
+'--override-session-key string'
+ Don't use the public key but the session key 'string'. The format
+ of this string is the same as the one printed by
+ '--show-session-key'. This option is normally not used but comes
+ handy in case someone forces you to reveal the content of an
+ encrypted message; using this option you can do this without
+ handing out the secret key.
+
+'--ask-sig-expire'
+'--no-ask-sig-expire'
+ When making a data signature, prompt for an expiration time. If
+ this option is not specified, the expiration time set via
+ '--default-sig-expire' is used. '--no-ask-sig-expire' disables
+ this option.
+
+'--default-sig-expire'
+ The default expiration time to use for signature expiration. Valid
+ values are "0" for no expiration, a number followed by the letter d
+ (for days), w (for weeks), m (for months), or y (for years) (for
+ example "2m" for two months, or "5y" for five years), or an
+ absolute date in the form YYYY-MM-DD. Defaults to "0".
+
+'--ask-cert-expire'
+'--no-ask-cert-expire'
+ When making a key signature, prompt for an expiration time. If
+ this option is not specified, the expiration time set via
+ '--default-cert-expire' is used. '--no-ask-cert-expire' disables
+ this option.
+
+'--default-cert-expire'
+ The default expiration time to use for key signature expiration.
+ Valid values are "0" for no expiration, a number followed by the
+ letter d (for days), w (for weeks), m (for months), or y (for
+ years) (for example "2m" for two months, or "5y" for five years),
+ or an absolute date in the form YYYY-MM-DD. Defaults to "0".
+
+'--allow-secret-key-import'
+ This is an obsolete option and is not used anywhere.
+
+'--allow-multiple-messages'
+'--no-allow-multiple-messages'
+ Allow processing of multiple OpenPGP messages contained in a single
+ file or stream. Some programs that call GPG are not prepared to
+ deal with multiple messages being processed together, so this
+ option defaults to no. Note that versions of GPG prior to 1.4.7
+ always allowed multiple messages.
+
+ Warning: Do not use this option unless you need it as a temporary
+ workaround!
+
+'--enable-special-filenames'
+ This options enables a mode in which filenames of the form '-&n',
+ where n is a non-negative decimal number, refer to the file
+ descriptor n and not to a file with that name.
+
+'--no-expensive-trust-checks'
+ Experimental use only.
+
+'--preserve-permissions'
+ Don't change the permissions of a secret keyring back to user
+ read/write only. Use this option only if you really know what you
+ are doing.
+
+'--default-preference-list string'
+ Set the list of default preferences to 'string'. This preference
+ list is used for new keys and becomes the default for "setpref" in
+ the edit menu.
+
+'--default-keyserver-url name'
+ Set the default keyserver URL to 'name'. This keyserver will be
+ used as the keyserver URL when writing a new self-signature on a
+ key, which includes key generation and changing preferences.
+
+'--list-config'
+ Display various internal configuration parameters of GnuPG. This
+ option is intended for external programs that call GnuPG to perform
+ tasks, and is thus not generally useful. See the file
+ 'doc/DETAILS' in the source distribution for the details of which
+ configuration items may be listed. '--list-config' is only usable
+ with '--with-colons' set.
+
+'--list-gcrypt-config'
+ Display various internal configuration parameters of Libgcrypt.
+
+'--gpgconf-list'
+ This command is similar to '--list-config' but in general only
+ internally used by the 'gpgconf' tool.
+
+'--gpgconf-test'
+ This is more or less dummy action. However it parses the
+ configuration file and returns with failure if the configuration
+ file would prevent 'gpg' from startup. Thus it may be used to run
+ a syntax check on the configuration file.
+
+ ---------- Footnotes ----------
+
+ (1) Using a little social engineering anyone who is able to decrypt
+the message can check whether one of the other recipients is the one he
+suspects.
+
+
+File: gnupg.info, Node: Deprecated Options, Prev: GPG Esoteric Options, Up: GPG Options
+
+4.2.7 Deprecated options
+------------------------
+
+'--show-photos'
+'--no-show-photos'
+ Causes '--list-keys', '--list-sigs', '--list-public-keys',
+ '--list-secret-keys', and verifying a signature to also display the
+ photo ID attached to the key, if any. See also '--photo-viewer'.
+ These options are deprecated. Use '--list-options
+ [no-]show-photos' and/or '--verify-options [no-]show-photos'
+ instead.
+
+'--show-keyring'
+ Display the keyring name at the head of key listings to show which
+ keyring a given key resides on. This option is deprecated: use
+ '--list-options [no-]show-keyring' instead.
+
+'--always-trust'
+ Identical to '--trust-model always'. This option is deprecated.
+
+'--show-notation'
+'--no-show-notation'
+ Show signature notations in the '--list-sigs' or '--check-sigs'
+ listings as well as when verifying a signature with a notation in
+ it. These options are deprecated. Use '--list-options
+ [no-]show-notation' and/or '--verify-options [no-]show-notation'
+ instead.
+
+'--show-policy-url'
+'--no-show-policy-url'
+ Show policy URLs in the '--list-sigs' or '--check-sigs' listings as
+ well as when verifying a signature with a policy URL in it. These
+ options are deprecated. Use '--list-options [no-]show-policy-url'
+ and/or '--verify-options [no-]show-policy-url' instead.
+
+
+File: gnupg.info, Node: GPG Configuration, Next: GPG Examples, Prev: GPG Options, Up: Invoking GPG
+
+4.3 Configuration files
+=======================
+
+There are a few configuration files to control certain aspects of
+'gpg''s operation. Unless noted, they are expected in the current home
+directory (*note option --homedir::).
+
+'gpg.conf'
+ This is the standard configuration file read by 'gpg' on startup.
+ It may contain any valid long option; the leading two dashes may
+ not be entered and the option may not be abbreviated. This default
+ name may be changed on the command line (*note gpg-option
+ --options::). You should backup this file.
+
+ Note that on larger installations, it is useful to put predefined
+files into the directory '/etc/skel/.gnupg' so that newly created users
+start up with a working configuration. For existing users a small
+helper script is provided to create these files (*note addgnupghome::).
+
+ For internal purposes 'gpg' creates and maintains a few other files;
+They all live in in the current home directory (*note option
+--homedir::). Only the 'gpg' program may modify these files.
+
+'~/.gnupg'
+ This is the default home directory which is used if neither the
+ environment variable 'GNUPGHOME' nor the option '--homedir' is
+ given.
+
+'~/.gnupg/pubring.gpg'
+ The public keyring. You should backup this file.
+
+'~/.gnupg/pubring.gpg.lock'
+ The lock file for the public keyring.
+
+'~/.gnupg/pubring.kbx'
+ The public keyring using a different format. This file is sharred
+ with 'gpgsm'. You should backup this file.
+
+'~/.gnupg/pubring.kbx.lock'
+ The lock file for 'pubring.kbx'.
+
+'~/.gnupg/secring.gpg'
+ A secret keyring as used by GnuPG versions before 2.1. It is not
+ used by GnuPG 2.1 and later.
+
+'~/.gnupg/secring.gpg.lock'
+ The lock file for the secret keyring.
+
+'~/.gnupg/.gpg-v21-migrated'
+ File indicating that a migration to GnuPG 2.1 has been done.
+
+'~/.gnupg/trustdb.gpg'
+ The trust database. There is no need to backup this file; it is
+ better to backup the ownertrust values (*note option
+ --export-ownertrust::).
+
+'~/.gnupg/trustdb.gpg.lock'
+ The lock file for the trust database.
+
+'~/.gnupg/random_seed'
+ A file used to preserve the state of the internal random pool.
+
+'~/.gnupg/openpgp-revocs.d/'
+ This is the directory where gpg stores pre-generated revocation
+ certificates. The file name corresponds to the OpenPGP fingerprint
+ of the respective key. It is suggested to backup those
+ certificates and if the primary private key is not stored on the
+ disk to move them to an external storage device. Anyone who can
+ access theses files is able to revoke the corresponding key. You
+ may want to print them out. You should backup all files in this
+ directory and take care to keep this backup closed away.
+
+'/usr/local/share/gnupg/options.skel'
+ The skeleton options file.
+
+ Operation is further controlled by a few environment variables:
+
+HOME
+ Used to locate the default home directory.
+
+GNUPGHOME
+ If set directory used instead of "~/.gnupg".
+
+GPG_AGENT_INFO
+ This variable is obsolete; it was used by GnuPG versions before
+ 2.1.
+
+PINENTRY_USER_DATA
+ This value is passed via gpg-agent to pinentry. It is useful to
+ convey extra information to a custom pinentry.
+
+COLUMNS
+LINES
+ Used to size some displays to the full size of the screen.
+
+LANGUAGE
+ Apart from its use by GNU, it is used in the W32 version to
+ override the language selection done through the Registry. If used
+ and set to a valid and available language name (LANGID), the file
+ with the translation is loaded from
+
+ 'GPGDIR/gnupg.nls/LANGID.mo'. Here GPGDIR is the directory out of
+ which the gpg binary has been loaded. If it can't be loaded the
+ Registry is tried and as last resort the native Windows locale
+ system is used.
+
+
+File: gnupg.info, Node: GPG Examples, Next: Unattended Usage of GPG, Prev: GPG Configuration, Up: Invoking GPG
+
+4.4 Examples
+============
+
+gpg -se -r 'Bob' 'file'
+ sign and encrypt for user Bob
+
+gpg -clearsign 'file'
+ make a clear text signature
+
+gpg -sb 'file'
+ make a detached signature
+
+gpg -u 0x12345678 -sb 'file'
+ make a detached signature with the key 0x12345678
+
+gpg -list-keys 'user_ID'
+ show keys
+
+gpg -fingerprint 'user_ID'
+ show fingerprint
+
+gpg -verify 'pgpfile'
+gpg -verify 'sigfile'
+ Verify the signature of the file but do not output the data. The
+ second form is used for detached signatures, where 'sigfile' is the
+ detached signature (either ASCII armored or binary) and are the
+ signed data; if this is not given, the name of the file holding the
+ signed data is constructed by cutting off the extension (".asc" or
+ ".sig") of 'sigfile' or by asking the user for the filename.
+
+FILTER EXPRESSIONS
+******************
+
+The options '--import-filter' and '--export-filter' use expressions with
+this syntax (square brackets indicate an optional part and curly braces
+a repetition, white space between the elements are allowed):
+
+ [lc] {[{flag}] PROPNAME op VALUE [lc]}
+
+ The name of a property (PROPNAME) may only consist of letters, digits
+and underscores. The description for the filter type describes which
+properties are defined. If an undefined property is used it evaluates
+to the empty string. Unless otherwise noted, the VALUE must always be
+given and may not be the empty string. No quoting is defined for the
+value, thus the value may not contain the strings '&&' or '||', which
+are used as logical connection operators. The flag '--' can be used to
+remove this restriction.
+
+ Numerical values are computed as long int; standard C notation
+applies. LC is the logical connection operator; either '&&' for a
+conjunction or '||' for a disjunction. A conjunction is assumed at the
+begin of an expression. Conjunctions have higher precedence than
+disjunctions. If VALUE starts with one of the characters used in any OP
+a space after the OP is required.
+
+The supported operators (OP) are:
+
+=~
+ Substring must match.
+
+!~
+ Substring must not match.
+
+=
+ The full string must match.
+
+<>
+ The full string must not match.
+
+==
+ The numerical value must match.
+
+!=
+ The numerical value must not match.
+
+<=
+ The numerical value of the field must be LE than the value.
+
+<
+ The numerical value of the field must be LT than the value.
+
+>=
+ The numerical value of the field must be GT than the value.
+
+>=
+ The numerical value of the field must be GE than the value.
+
+-n
+ True if value is not empty (no value allowed).
+
+-z
+ True if value is empty (no value allowed).
+
+-t
+ Alias for "PROPNAME != 0" (no value allowed).
+
+-f
+ Alias for "PROPNAME == 0" (no value allowed).
+
+Values for FLAG must be space separated. The supported flags are:
+
+-
+ VALUE spans to the end of the expression.
+-c
+ The string match in this part is done case-sensitive.
+
+ The filter options concatenate several specifications for a filter of
+the same type. For example the four options in this example:
+
+ --import-option keep-uid="uid =~ Alfa"
+ --import-option keep-uid="&& uid !~ Test"
+ --import-option keep-uid="|| uid =~ Alpha"
+ --import-option keep-uid="uid !~ Test"
+
+which is equivalent to
+
+ --import-option \
+ keep-uid="uid =~ Alfa" && uid !~ Test" || uid =~ Alpha" && "uid !~ Test"
+
+ imports only the user ids of a key containing the strings "Alfa" or
+"Alpha" but not the string "test".
+
+RETURN VALUE
+************
+
+The program returns 0 if everything was fine, 1 if at least a signature
+was bad, and other error codes for fatal errors.
+
+WARNINGS
+********
+
+Use a *good* password for your user account and a *good* passphrase to
+protect your secret key. This passphrase is the weakest part of the
+whole system. Programs to do dictionary attacks on your secret keyring
+are very easy to write and so you should protect your "~/.gnupg/"
+directory very well.
+
+ Keep in mind that, if this program is used over a network (telnet),
+it is *very* easy to spy out your passphrase!
+
+ If you are going to verify detached signatures, make sure that the
+program knows about it; either give both filenames on the command line
+or use '-' to specify STDIN.
+
+INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS
+********************************************
+
+GnuPG tries to be a very flexible implementation of the OpenPGP
+standard. In particular, GnuPG implements many of the optional parts of
+the standard, such as the SHA-512 hash, and the ZLIB and BZIP2
+compression algorithms. It is important to be aware that not all
+OpenPGP programs implement these optional algorithms and that by forcing
+their use via the '--cipher-algo', '--digest-algo',
+'--cert-digest-algo', or '--compress-algo' options in GnuPG, it is
+possible to create a perfectly valid OpenPGP message, but one that
+cannot be read by the intended recipient.
+
+ There are dozens of variations of OpenPGP programs available, and
+each supports a slightly different subset of these optional algorithms.
+For example, until recently, no (unhacked) version of PGP supported the
+BLOWFISH cipher algorithm. A message using BLOWFISH simply could not be
+read by a PGP user. By default, GnuPG uses the standard OpenPGP
+preferences system that will always do the right thing and create
+messages that are usable by all recipients, regardless of which OpenPGP
+program they use. Only override this safe default if you really know
+what you are doing.
+
+ If you absolutely must override the safe default, or if the
+preferences on a given key are invalid for some reason, you are far
+better off using the '--pgp6', '--pgp7', or '--pgp8' options. These
+options are safe as they do not force any particular algorithms in
+violation of OpenPGP, but rather reduce the available algorithms to a
+"PGP-safe" list.
+
+BUGS
+****
+
+On older systems this program should be installed as setuid(root). This
+is necessary to lock memory pages. Locking memory pages prevents the
+operating system from writing memory pages (which may contain
+passphrases or other sensitive material) to disk. If you get no warning
+message about insecure memory your operating system supports locking
+without being root. The program drops root privileges as soon as locked
+memory is allocated.
+
+ Note also that some systems (especially laptops) have the ability to
+"suspend to disk" (also known as "safe sleep" or "hibernate"). This
+writes all memory to disk before going into a low power or even powered
+off mode. Unless measures are taken in the operating system to protect
+the saved memory, passphrases or other sensitive material may be
+recoverable from it later.
+
+ Before you report a bug you should first search the mailing list
+archives for similar problems and second check whether such a bug has
+already been reported to our bug tracker at http://bugs.gnupg.org .
+
+
+File: gnupg.info, Node: Unattended Usage of GPG, Prev: GPG Examples, Up: Invoking GPG
+
+4.5 Unattended Usage
+====================
+
+'gpg' is often used as a backend engine by other software. To help with
+this a machine interface has been defined to have an unambiguous way to
+do this. The options '--status-fd' and '--batch' are almost always
+required for this.
+
+* Menu:
+
+* Unattended GPG key generation:: Unattended key generation
+
+
+File: gnupg.info, Node: Unattended GPG key generation, Up: Unattended Usage of GPG
+
+4.5.1 Unattended key generation
+-------------------------------
+
+The command '--gen-key' may be used along with the option '--batch' for
+unattended key generation. The parameters are either read from stdin or
+given as a file on the command line. The format of the parameter file
+is as follows:
+
+ * Text only, line length is limited to about 1000 characters.
+ * UTF-8 encoding must be used to specify non-ASCII characters.
+ * Empty lines are ignored.
+ * Leading and trailing while space is ignored.
+ * A hash sign as the first non white space character indicates a
+ comment line.
+ * Control statements are indicated by a leading percent sign, the
+ arguments are separated by white space from the keyword.
+ * Parameters are specified by a keyword, followed by a colon.
+ Arguments are separated by white space.
+ * The first parameter must be 'Key-Type'; control statements may be
+ placed anywhere.
+ * The order of the parameters does not matter except for 'Key-Type'
+ which must be the first parameter. The parameters are only used
+ for the generated keyblock (primary and subkeys); parameters from
+ previous sets are not used. Some syntactically checks may be
+ performed.
+ * Key generation takes place when either the end of the parameter
+ file is reached, the next 'Key-Type' parameter is encountered or at
+ the control statement '%commit' is encountered.
+
+Control statements:
+
+%echo TEXT
+ Print TEXT as diagnostic.
+
+%dry-run
+ Suppress actual key generation (useful for syntax checking).
+
+%commit
+ Perform the key generation. Note that an implicit commit is done
+ at the next Key-Type parameter.
+
+%pubring FILENAME
+%secring FILENAME
+ Do not write the key to the default or commandline given keyring
+ but to FILENAME. This must be given before the first commit to
+ take place, duplicate specification of the same filename is
+ ignored, the last filename before a commit is used. The filename
+ is used until a new filename is used (at commit points) and all
+ keys are written to that file. If a new filename is given, this
+ file is created (and overwrites an existing one). For GnuPG
+ versions prior to 2.1, both control statements must be given. For
+ GnuPG 2.1 and later '%secring' is a no-op.
+
+%ask-passphrase
+%no-ask-passphrase
+ This option is a no-op for GnuPG 2.1 and later.
+
+%no-protection
+ Using this option allows the creation of keys without any
+ passphrase protection. This option is mainly intended for
+ regression tests.
+
+%transient-key
+ If given the keys are created using a faster and a somewhat less
+ secure random number generator. This option may be used for keys
+ which are only used for a short time and do not require full
+ cryptographic strength. It takes only effect if used together with
+ the control statement '%no-protection'.
+
+General Parameters:
+
+Key-Type: ALGO
+ Starts a new parameter block by giving the type of the primary key.
+ The algorithm must be capable of signing. This is a required
+ parameter. ALGO may either be an OpenPGP algorithm number or a
+ string with the algorithm name. The special value 'default' may be
+ used for ALGO to create the default key type; in this case a
+ 'Key-Usage' shall not be given and 'default' also be used for
+ 'Subkey-Type'.
+
+Key-Length: NBITS
+ The requested length of the generated key in bits. The default is
+ returned by running the command 'gpg --gpgconf-list'.
+
+Key-Grip: HEXSTRING
+ This is optional and used to generate a CSR or certificate for an
+ already existing key. Key-Length will be ignored when given.
+
+Key-Usage: USAGE-LIST
+ Space or comma delimited list of key usages. Allowed values are
+ 'encrypt', 'sign', and 'auth'. This is used to generate the key
+ flags. Please make sure that the algorithm is capable of this
+ usage. Note that OpenPGP requires that all primary keys are
+ capable of certification, so no matter what usage is given here,
+ the 'cert' flag will be on. If no 'Key-Usage' is specified and the
+ 'Key-Type' is not 'default', all allowed usages for that particular
+ algorithm are used; if it is not given but 'default' is used the
+ usage will be 'sign'.
+
+Subkey-Type: ALGO
+ This generates a secondary key (subkey). Currently only one subkey
+ can be handled. See also 'Key-Type' above.
+
+Subkey-Length: NBITS
+ Length of the secondary key (subkey) in bits. The default is
+ returned by running the command 'gpg --gpgconf-list'".
+
+Subkey-Usage: USAGE-LIST
+ Key usage lists for a subkey; similar to 'Key-Usage'.
+
+Passphrase: STRING
+ If you want to specify a passphrase for the secret key, enter it
+ here. Default is to use the Pinentry dialog to ask for a
+ passphrase.
+
+Name-Real: NAME
+Name-Comment: COMMENT
+Name-Email: EMAIL
+ The three parts of a user name. Remember to use UTF-8 encoding
+ here. If you don't give any of them, no user ID is created.
+
+Expire-Date: ISO-DATE|(NUMBER[d|w|m|y])
+ Set the expiration date for the key (and the subkey). It may
+ either be entered in ISO date format (e.g. "20000815T145012") or
+ as number of days, weeks, month or years after the creation date.
+ The special notation "seconds=N" is also allowed to specify a
+ number of seconds since creation. Without a letter days are
+ assumed. Note that there is no check done on the overflow of the
+ type used by OpenPGP for timestamps. Thus you better make sure
+ that the given value make sense. Although OpenPGP works with time
+ intervals, GnuPG uses an absolute value internally and thus the
+ last year we can represent is 2105.
+
+Creation-Date: ISO-DATE
+ Set the creation date of the key as stored in the key information
+ and which is also part of the fingerprint calculation. Either a
+ date like "1986-04-26" or a full timestamp like "19860426T042640"
+ may be used. The time is considered to be UTC. The special
+ notation "seconds=N" may be used to directly specify a the number
+ of seconds since Epoch (Unix time). If it is not given the current
+ time is used.
+
+Preferences: STRING
+ Set the cipher, hash, and compression preference values for this
+ key. This expects the same type of string as the sub-command
+ 'setpref' in the '--edit-key' menu.
+
+Revoker: ALGO:FPR [sensitive]
+ Add a designated revoker to the generated key. Algo is the public
+ key algorithm of the designated revoker (i.e. RSA=1, DSA=17, etc.)
+ FPR is the fingerprint of the designated revoker. The optional
+ 'sensitive' flag marks the designated revoker as sensitive
+ information. Only v4 keys may be designated revokers.
+
+Keyserver: STRING
+ This is an optional parameter that specifies the preferred
+ keyserver URL for the key.
+
+Handle: STRING
+ This is an optional parameter only used with the status lines
+ KEY_CREATED and KEY_NOT_CREATED. STRING may be up to 100 characters
+ and should not contain spaces. It is useful for batch key
+ generation to associate a key parameter block with a status line.
+
+Here is an example on how to create a key:
+ $ cat >foo <<EOF
+ %echo Generating a basic OpenPGP key
+ Key-Type: DSA
+ Key-Length: 1024
+ Subkey-Type: ELG-E
+ Subkey-Length: 1024
+ Name-Real: Joe Tester
+ Name-Comment: with stupid passphrase
+ Name-Email: joe at foo.bar
+ Expire-Date: 0
+ Passphrase: abc
+ %pubring foo.pub
+ %secring foo.sec
+ # Do a commit here, so that we can later print "done" :-)
+ %commit
+ %echo done
+ EOF
+ $ gpg --batch --gen-key foo
+ [...]
+ $ gpg --no-default-keyring --secret-keyring ./foo.sec \
+ --keyring ./foo.pub --list-secret-keys
+ /home/wk/work/gnupg-stable/scratch/foo.sec
+ ------------------------------------------
+ sec 1024D/915A878D 2000-03-09 Joe Tester (with stupid passphrase) <joe at foo.bar>
+ ssb 1024g/8F70E2C0 2000-03-09
+
+If you want to create a key with the default algorithms you would use
+these parameters:
+ %echo Generating a default key
+ Key-Type: default
+ Subkey-Type: default
+ Name-Real: Joe Tester
+ Name-Comment: with stupid passphrase
+ Name-Email: joe at foo.bar
+ Expire-Date: 0
+ Passphrase: abc
+ %pubring foo.pub
+ %secring foo.sec
+ # Do a commit here, so that we can later print "done" :-)
+ %commit
+ %echo done
+
+
+File: gnupg.info, Node: Invoking GPGSM, Next: Invoking SCDAEMON, Prev: Invoking GPG, Up: Top
+
+5 Invoking GPGSM
+****************
+
+'gpgsm' is a tool similar to 'gpg' to provide digital encryption and
+signing services on X.509 certificates and the CMS protocol. It is
+mainly used as a backend for S/MIME mail processing. 'gpgsm' includes a
+full featured certificate management and complies with all rules defined
+for the German Sphinx project.
+
+ *Note Option Index::, for an index to 'GPGSM''s commands and options.
+
+* Menu:
+
+* GPGSM Commands:: List of all commands.
+* GPGSM Options:: List of all options.
+* GPGSM Configuration:: Configuration files.
+* GPGSM Examples:: Some usage examples.
+
+Developer information:
+* Unattended Usage:: Using 'gpgsm' from other programs.
+* GPGSM Protocol:: The protocol the server mode uses.
+
+
+File: gnupg.info, Node: GPGSM Commands, Next: GPGSM Options, Up: Invoking GPGSM
+
+5.1 Commands
+============
+
+Commands are not distinguished from options except for the fact that
+only one command is allowed.
+
+* Menu:
+
+* General GPGSM Commands:: Commands not specific to the functionality.
+* Operational GPGSM Commands:: Commands to select the type of operation.
+* Certificate Management:: How to manage certificates.
+
+
+File: gnupg.info, Node: General GPGSM Commands, Next: Operational GPGSM Commands, Up: GPGSM Commands
+
+5.1.1 Commands not specific to the function
+-------------------------------------------
+
+'--version'
+ Print the program version and licensing information. Note that you
+ cannot abbreviate this command.
+
+'--help, -h'
+ Print a usage message summarizing the most useful command-line
+ options. Note that you cannot abbreviate this command.
+
+'--warranty'
+ Print warranty information. Note that you cannot abbreviate this
+ command.
+
+'--dump-options'
+ Print a list of all available options and commands. Note that you
+ cannot abbreviate this command.
+
+
+File: gnupg.info, Node: Operational GPGSM Commands, Next: Certificate Management, Prev: General GPGSM Commands, Up: GPGSM Commands
+
+5.1.2 Commands to select the type of operation
+----------------------------------------------
+
+'--encrypt'
+ Perform an encryption. The keys the data is encrypted too must be
+ set using the option '--recipient'.
+
+'--decrypt'
+ Perform a decryption; the type of input is automatically
+ determined. It may either be in binary form or PEM encoded;
+ automatic determination of base-64 encoding is not done.
+
+'--sign'
+ Create a digital signature. The key used is either the fist one
+ found in the keybox or those set with the '--local-user' option.
+
+'--verify'
+ Check a signature file for validity. Depending on the arguments a
+ detached signature may also be checked.
+
+'--server'
+ Run in server mode and wait for commands on the 'stdin'.
+
+'--call-dirmngr COMMAND [ARGS]'
+ Behave as a Dirmngr client issuing the request COMMAND with the
+ optional list of ARGS. The output of the Dirmngr is printed
+ stdout. Please note that file names given as arguments should have
+ an absolute file name (i.e. commencing with '/' because they are
+ passed verbatim to the Dirmngr and the working directory of the
+ Dirmngr might not be the same as the one of this client. Currently
+ it is not possible to pass data via stdin to the Dirmngr. COMMAND
+ should not contain spaces.
+
+ This is command is required for certain maintaining tasks of the
+ dirmngr where a dirmngr must be able to call back to 'gpgsm'. See
+ the Dirmngr manual for details.
+
+'--call-protect-tool ARGUMENTS'
+ Certain maintenance operations are done by an external program call
+ 'gpg-protect-tool'; this is usually not installed in a directory
+ listed in the PATH variable. This command provides a simple
+ wrapper to access this tool. ARGUMENTS are passed verbatim to this
+ command; use '--help' to get a list of supported operations.
+
+
+File: gnupg.info, Node: Certificate Management, Prev: Operational GPGSM Commands, Up: GPGSM Commands
+
+5.1.3 How to manage the certificates and keys
+---------------------------------------------
+
+'--gen-key'
+ This command allows the creation of a certificate signing request
+ or a self-signed certificate. It is commonly used along with the
+ '--output' option to save the created CSR or certificate into a
+ file. If used with the '--batch' a parameter file is used to
+ create the CSR or certificate and it is further possible to create
+ non-self-signed certificates.
+
+'--list-keys'
+'-k'
+ List all available certificates stored in the local key database.
+ Note that the displayed data might be reformatted for better human
+ readability and illegal characters are replaced by safe
+ substitutes.
+
+'--list-secret-keys'
+'-K'
+ List all available certificates for which a corresponding a secret
+ key is available.
+
+'--list-external-keys PATTERN'
+ List certificates matching PATTERN using an external server. This
+ utilizes the 'dirmngr' service.
+
+'--list-chain'
+ Same as '--list-keys' but also prints all keys making up the chain.
+
+'--dump-cert'
+'--dump-keys'
+ List all available certificates stored in the local key database
+ using a format useful mainly for debugging.
+
+'--dump-chain'
+ Same as '--dump-keys' but also prints all keys making up the chain.
+
+'--dump-secret-keys'
+ List all available certificates for which a corresponding a secret
+ key is available using a format useful mainly for debugging.
+
+'--dump-external-keys PATTERN'
+ List certificates matching PATTERN using an external server. This
+ utilizes the 'dirmngr' service. It uses a format useful mainly for
+ debugging.
+
+'--keydb-clear-some-cert-flags'
+ This is a debugging aid to reset certain flags in the key database
+ which are used to cache certain certificate stati. It is
+ especially useful if a bad CRL or a weird running OCSP responder
+ did accidentally revoke certificate. There is no security issue
+ with this command because 'gpgsm' always make sure that the
+ validity of a certificate is checked right before it is used.
+
+'--delete-keys PATTERN'
+ Delete the keys matching PATTERN. Note that there is no command to
+ delete the secret part of the key directly. In case you need to do
+ this, you should run the command 'gpgsm --dump-secret-keys KEYID'
+ before you delete the key, copy the string of hex-digits in the
+ "keygrip" line and delete the file consisting of these hex-digits
+ and the suffix '.key' from the 'private-keys-v1.d' directory below
+ our GnuPG home directory (usually '~/.gnupg').
+
+'--export [PATTERN]'
+ Export all certificates stored in the Keybox or those specified by
+ the optional PATTERN. Those pattern consist of a list of user ids
+ (*note how-to-specify-a-user-id::). When used along with the
+ '--armor' option a few informational lines are prepended before
+ each block. There is one limitation: As there is no commonly
+ agreed upon way to pack more than one certificate into an ASN.1
+ structure, the binary export (i.e. without using 'armor') works
+ only for the export of one certificate. Thus it is required to
+ specify a PATTERN which yields exactly one certificate. Ephemeral
+ certificate are only exported if all PATTERN are given as
+ fingerprints or keygrips.
+
+'--export-secret-key-p12 KEY-ID'
+ Export the private key and the certificate identified by KEY-ID in
+ a PKCS#12 format. When used with the '--armor' option a few
+ informational lines are prepended to the output. Note, that the
+ PKCS#12 format is not very secure and this command is only provided
+ if there is no other way to exchange the private key. (*note
+ option --p12-charset::)
+
+'--export-secret-key-p8 KEY-ID'
+'--export-secret-key-raw KEY-ID'
+ Export the private key of the certificate identified by KEY-ID with
+ any encryption stripped. The '...-raw' command exports in PKCS#1
+ format; the '...-p8' command exports in PKCS#8 format. When used
+ with the '--armor' option a few informational lines are prepended
+ to the output. These commands are useful to prepare a key for use
+ on a TLS server.
+
+'--import [FILES]'
+ Import the certificates from the PEM or binary encoded files as
+ well as from signed-only messages. This command may also be used
+ to import a secret key from a PKCS#12 file.
+
+'--learn-card'
+ Read information about the private keys from the smartcard and
+ import the certificates from there. This command utilizes the
+ 'gpg-agent' and in turn the 'scdaemon'.
+
+'--passwd USER_ID'
+ Change the passphrase of the private key belonging to the
+ certificate specified as USER_ID. Note, that changing the
+ passphrase/PIN of a smartcard is not yet supported.
+
+
+File: gnupg.info, Node: GPGSM Options, Next: GPGSM Configuration, Prev: GPGSM Commands, Up: Invoking GPGSM
+
+5.2 Option Summary
+==================
+
+'GPGSM' features a bunch of options to control the exact behaviour and
+to change the default configuration.
+
+* Menu:
+
+* Configuration Options:: How to change the configuration.
+* Certificate Options:: Certificate related options.
+* Input and Output:: Input and Output.
+* CMS Options:: How to change how the CMS is created.
+* Esoteric Options:: Doing things one usually do not want to do.
+
+
+File: gnupg.info, Node: Configuration Options, Next: Certificate Options, Up: GPGSM Options
+
+5.2.1 How to change the configuration
+-------------------------------------
+
+These options are used to change the configuration and are usually found
+in the option file.
+
+'--options FILE'
+ Reads configuration from FILE instead of from the default per-user
+ configuration file. The default configuration file is named
+ 'gpgsm.conf' and expected in the '.gnupg' directory directly below
+ the home directory of the user.
+
+'--homedir DIR'
+ Set the name of the home directory to DIR. If this option is not
+ used, the home directory defaults to '~/.gnupg'. It is only
+ recognized when given on the command line. It also overrides any
+ home directory stated through the environment variable 'GNUPGHOME'
+ or (on Windows systems) by means of the Registry entry
+ HKCU\SOFTWARE\GNU\GNUPG:HOMEDIR.
+
+ On Windows systems it is possible to install GnuPG as a portable
+ application. In this case only this command line option is
+ considered, all other ways to set a home directory are ignored.
+
+ To install GnuPG as a portable application under Windows, create an
+ empty file name 'gpgconf.ctl' in the same directory as the tool
+ 'gpgconf.exe'. The root of the installation is than that
+ directory; or, if 'gpgconf.exe' has been installed directly below a
+ directory named 'bin', its parent directory. You also need to make
+ sure that the following directories exist and are writable:
+ 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ for internal cache files.
+
+'-v'
+'--verbose'
+ Outputs additional information while running. You can increase the
+ verbosity by giving several verbose commands to 'gpgsm', such as
+ '-vv'.
+
+'--policy-file FILENAME'
+ Change the default name of the policy file to FILENAME.
+
+'--agent-program FILE'
+ Specify an agent program to be used for secret key operations. The
+ default value is determined by running the command 'gpgconf'. Note
+ that the pipe symbol ('|') is used for a regression test suite hack
+ and may thus not be used in the file name.
+
+'--dirmngr-program FILE'
+ Specify a dirmngr program to be used for CRL checks. The default
+ value is '/usr/local/bin/dirmngr'.
+
+'--prefer-system-dirmngr'
+ If a system wide 'dirmngr' is running in daemon mode, first try to
+ connect to this one. Fallback to a pipe based server if this does
+ not work. Under Windows this option is ignored because the system
+ dirmngr is always used.
+
+'--disable-dirmngr'
+ Entirely disable the use of the Dirmngr.
+
+'--no-autostart'
+ Do not start the gpg-agent or the dirmngr if it has not yet been
+ started and its service is required. This option is mostly useful
+ on machines where the connection to gpg-agent has been redirected
+ to another machines. If dirmngr is required on the remote machine,
+ it may be started manually using 'gpgconf --launch dirmngr'.
+
+'--no-secmem-warning'
+ Do not print a warning when the so called "secure memory" cannot be
+ used.
+
+'--log-file FILE'
+ When running in server mode, append all logging output to FILE.
+
+
+File: gnupg.info, Node: Certificate Options, Next: Input and Output, Prev: Configuration Options, Up: GPGSM Options
+
+5.2.2 Certificate related options
+---------------------------------
+
+'--enable-policy-checks'
+'--disable-policy-checks'
+ By default policy checks are enabled. These options may be used to
+ change it.
+
+'--enable-crl-checks'
+'--disable-crl-checks'
+ By default the CRL checks are enabled and the DirMngr is used to
+ check for revoked certificates. The disable option is most useful
+ with an off-line network connection to suppress this check.
+
+'--enable-trusted-cert-crl-check'
+'--disable-trusted-cert-crl-check'
+ By default the CRL for trusted root certificates are checked like
+ for any other certificates. This allows a CA to revoke its own
+ certificates voluntary without the need of putting all ever issued
+ certificates into a CRL. The disable option may be used to switch
+ this extra check off. Due to the caching done by the Dirmngr,
+ there will not be any noticeable performance gain. Note, that this
+ also disables possible OCSP checks for trusted root certificates.
+ A more specific way of disabling this check is by adding the
+ "relax" keyword to the root CA line of the 'trustlist.txt'
+
+'--force-crl-refresh'
+ Tell the dirmngr to reload the CRL for each request. For better
+ performance, the dirmngr will actually optimize this by suppressing
+ the loading for short time intervals (e.g. 30 minutes). This
+ option is useful to make sure that a fresh CRL is available for
+ certificates hold in the keybox. The suggested way of doing this
+ is by using it along with the option '--with-validation' for a key
+ listing command. This option should not be used in a configuration
+ file.
+
+'--enable-ocsp'
+'--disable-ocsp'
+ By default OCSP checks are disabled. The enable option may be used
+ to enable OCSP checks via Dirmngr. If CRL checks are also enabled,
+ CRLs will be used as a fallback if for some reason an OCSP request
+ will not succeed. Note, that you have to allow OCSP requests in
+ Dirmngr's configuration too (option '--allow-ocsp') and configure
+ Dirmngr properly. If you do not do so you will get the error code
+ 'Not supported'.
+
+'--auto-issuer-key-retrieve'
+ If a required certificate is missing while validating the chain of
+ certificates, try to load that certificate from an external
+ location. This usually means that Dirmngr is employed to search
+ for the certificate. Note that this option makes a "web bug" like
+ behavior possible. LDAP server operators can see which keys you
+ request, so by sending you a message signed by a brand new key
+ (which you naturally will not have on your local keybox), the
+ operator can tell both your IP address and the time when you
+ verified the signature.
+
+'--validation-model NAME'
+ This option changes the default validation model. The only
+ possible values are "shell" (which is the default), "chain" which
+ forces the use of the chain model and "steed" for a new simplified
+ model. The chain model is also used if an option in the
+ 'trustlist.txt' or an attribute of the certificate requests it.
+ However the standard model (shell) is in that case always tried
+ first.
+
+'--ignore-cert-extension OID'
+ Add OID to the list of ignored certificate extensions. The OID is
+ expected to be in dotted decimal form, like '2.5.29.3'. This
+ option may be used more than once. Critical flagged certificate
+ extensions matching one of the OIDs in the list are treated as if
+ they are actually handled and thus the certificate will not be
+ rejected due to an unknown critical extension. Use this option
+ with care because extensions are usually flagged as critical for a
+ reason.
+
+
+File: gnupg.info, Node: Input and Output, Next: CMS Options, Prev: Certificate Options, Up: GPGSM Options
+
+5.2.3 Input and Output
+----------------------
+
+'--armor'
+'-a'
+ Create PEM encoded output. Default is binary output.
+
+'--base64'
+ Create Base-64 encoded output; i.e. PEM without the header lines.
+
+'--assume-armor'
+ Assume the input data is PEM encoded. Default is to autodetect the
+ encoding but this is may fail.
+
+'--assume-base64'
+ Assume the input data is plain base-64 encoded.
+
+'--assume-binary'
+ Assume the input data is binary encoded.
+
+'--p12-charset NAME'
+ 'gpgsm' uses the UTF-8 encoding when encoding passphrases for
+ PKCS#12 files. This option may be used to force the passphrase to
+ be encoded in the specified encoding NAME. This is useful if the
+ application used to import the key uses a different encoding and
+ thus will not be able to import a file generated by 'gpgsm'.
+ Commonly used values for NAME are 'Latin1' and 'CP850'. Note that
+ 'gpgsm' itself automagically imports any file with a passphrase
+ encoded to the most commonly used encodings.
+
+'--default-key USER_ID'
+ Use USER_ID as the standard key for signing. This key is used if
+ no other key has been defined as a signing key. Note, that the
+ first '--local-users' option also sets this key if it has not yet
+ been set; however '--default-key' always overrides this.
+
+'--local-user USER_ID'
+'-u USER_ID'
+ Set the user(s) to be used for signing. The default is the first
+ secret key found in the database.
+
+'--recipient NAME'
+'-r'
+ Encrypt to the user id NAME. There are several ways a user id may
+ be given (*note how-to-specify-a-user-id::).
+
+'--output FILE'
+'-o FILE'
+ Write output to FILE. The default is to write it to stdout.
+
+'--with-key-data'
+ Displays extra information with the '--list-keys' commands.
+ Especially a line tagged 'grp' is printed which tells you the
+ keygrip of a key. This string is for example used as the file name
+ of the secret key.
+
+'--with-validation'
+ When doing a key listing, do a full validation check for each key
+ and print the result. This is usually a slow operation because it
+ requires a CRL lookup and other operations.
+
+ When used along with -import, a validation of the certificate to
+ import is done and only imported if it succeeds the test. Note
+ that this does not affect an already available certificate in the
+ DB. This option is therefore useful to simply verify a certificate.
+
+'--with-md5-fingerprint'
+ For standard key listings, also print the MD5 fingerprint of the
+ certificate.
+
+'--with-keygrip'
+ Include the keygrip in standard key listings. Note that the
+ keygrip is always listed in -with-colons mode.
+
+'--with-secret'
+ Include info about the presence of a secret key in public key
+ listings done with '--with-colons'.
+
+
+File: gnupg.info, Node: CMS Options, Next: Esoteric Options, Prev: Input and Output, Up: GPGSM Options
+
+5.2.4 How to change how the CMS is created.
+-------------------------------------------
+
+'--include-certs N'
+ Using N of -2 includes all certificate except for the root cert, -1
+ includes all certs, 0 does not include any certs, 1 includes only
+ the signers cert and all other positive values include up to N
+ certificates starting with the signer cert. The default is -2.
+
+'--cipher-algo OID'
+ Use the cipher algorithm with the ASN.1 object identifier OID for
+ encryption. For convenience the strings '3DES', 'AES' and 'AES256'
+ may be used instead of their OIDs. The default is 'AES'
+ (2.16.840.1.101.3.4.1.2).
+
+'--digest-algo name'
+ Use 'name' as the message digest algorithm. Usually this algorithm
+ is deduced from the respective signing certificate. This option
+ forces the use of the given algorithm and may lead to severe
+ interoperability problems.
+
+
+File: gnupg.info, Node: Esoteric Options, Prev: CMS Options, Up: GPGSM Options
+
+5.2.5 Doing things one usually do not want to do.
+-------------------------------------------------
+
+'--extra-digest-algo NAME'
+ Sometimes signatures are broken in that they announce a different
+ digest algorithm than actually used. 'gpgsm' uses a one-pass data
+ processing model and thus needs to rely on the announced digest
+ algorithms to properly hash the data. As a workaround this option
+ may be used to tell gpg to also hash the data using the algorithm
- NAME; this slows processing down a little bit but allows to verify
- such broken signatures. If 'gpgsm' prints an error like "digest
- algo 8 has not been enabled" you may want to try this option, with
- 'SHA256' for NAME.
++ NAME; this slows processing down a little bit but allows
++ verification of such broken signatures. If 'gpgsm' prints an error
++ like "digest algo 8 has not been enabled" you may want to try this
++ option, with 'SHA256' for NAME.
+
+'--faked-system-time EPOCH'
+ This option is only useful for testing; it sets the system time
+ back or forth to EPOCH which is the number of seconds elapsed since
+ the year 1970. Alternatively EPOCH may be given as a full ISO time
+ string (e.g. "20070924T154812").
+
+'--with-ephemeral-keys'
+ Include ephemeral flagged keys in the output of key listings. Note
+ that they are included anyway if the key specification for a
+ listing is given as fingerprint or keygrip.
+
+'--debug-level LEVEL'
+ Select the debug level for investigating problems. LEVEL may be a
+ numeric value or by a keyword:
+
+ 'none'
+ No debugging at all. A value of less than 1 may be used
+ instead of the keyword.
+ 'basic'
+ Some basic debug messages. A value between 1 and 2 may be
+ used instead of the keyword.
+ 'advanced'
+ More verbose debug messages. A value between 3 and 5 may be
+ used instead of the keyword.
+ 'expert'
+ Even more detailed messages. A value between 6 and 8 may be
+ used instead of the keyword.
+ 'guru'
+ All of the debug messages you can get. A value greater than 8
+ may be used instead of the keyword. The creation of hash
+ tracing files is only enabled if the keyword is used.
+
+ How these messages are mapped to the actual debugging flags is not
+ specified and may change with newer releases of this program. They
+ are however carefully selected to best aid in debugging.
+
+'--debug FLAGS'
+ This option is only useful for debugging and the behaviour may
+ change at any time without notice; using '--debug-levels' is the
+ preferred method to select the debug verbosity. FLAGS are bit
+ encoded and may be given in usual C-Syntax. The currently defined
+ bits are:
+
+ '0 (1)'
+ X.509 or OpenPGP protocol related data
+ '1 (2)'
+ values of big number integers
+ '2 (4)'
+ low level crypto operations
+ '5 (32)'
+ memory allocation
+ '6 (64)'
+ caching
+ '7 (128)'
+ show memory statistics.
+ '9 (512)'
+ write hashed data to files named 'dbgmd-000*'
+ '10 (1024)'
+ trace Assuan protocol
+
+ Note, that all flags set using this option may get overridden by
+ '--debug-level'.
+
+'--debug-all'
+ Same as '--debug=0xffffffff'
+
+'--debug-allow-core-dump'
+ Usually 'gpgsm' tries to avoid dumping core by well written code
+ and by disabling core dumps for security reasons. However, bugs
+ are pretty durable beasts and to squash them it is sometimes useful
+ to have a core dump. This option enables core dumps unless the Bad
+ Thing happened before the option parsing.
+
+'--debug-no-chain-validation'
+ This is actually not a debugging option but only useful as such.
+ It lets 'gpgsm' bypass all certificate chain validation checks.
+
+'--debug-ignore-expiration'
+ This is actually not a debugging option but only useful as such.
+ It lets 'gpgsm' ignore all notAfter dates, this is used by the
+ regression tests.
+
+'--passphrase-fd n'
+ Read the passphrase from file descriptor 'n'. Only the first line
+ will be read from file descriptor 'n'. If you use 0 for 'n', the
+ passphrase will be read from STDIN. This can only be used if only
+ one passphrase is supplied.
+
+ Note that this passphrase is only used if the option '--batch' has
+ also been given.
+
+'--pinentry-mode mode'
+ Set the pinentry mode to 'mode'. Allowed values for 'mode' are:
+ default
+ Use the default of the agent, which is 'ask'.
+ ask
+ Force the use of the Pinentry.
+ cancel
+ Emulate use of Pinentry's cancel button.
+ error
+ Return a Pinentry error ("No Pinentry").
+ loopback
+ Redirect Pinentry queries to the caller. Note that in
+ contrast to Pinentry the user is not prompted again if he
+ enters a bad password.
+
+'--no-common-certs-import'
+ Suppress the import of common certificates on keybox creation.
+
+ All the long options may also be given in the configuration file
+after stripping off the two leading dashes.
+
+
+File: gnupg.info, Node: GPGSM Configuration, Next: GPGSM Examples, Prev: GPGSM Options, Up: Invoking GPGSM
+
+5.3 Configuration files
+=======================
+
+There are a few configuration files to control certain aspects of
+'gpgsm''s operation. Unless noted, they are expected in the current
+home directory (*note option --homedir::).
+
+'gpgsm.conf'
+ This is the standard configuration file read by 'gpgsm' on startup.
+ It may contain any valid long option; the leading two dashes may
+ not be entered and the option may not be abbreviated. This default
+ name may be changed on the command line (*note gpgsm-option
+ --options::). You should backup this file.
+
+'policies.txt'
+ This is a list of allowed CA policies. This file should list the
+ object identifiers of the policies line by line. Empty lines and
+ lines starting with a hash mark are ignored. Policies missing in
+ this file and not marked as critical in the certificate will print
+ only a warning; certificates with policies marked as critical and
+ not listed in this file will fail the signature verification. You
+ should backup this file.
+
+ For example, to allow only the policy 2.289.9.9, the file should
+ look like this:
+
+ # Allowed policies
+ 2.289.9.9
+
+'qualified.txt'
+ This is the list of root certificates used for qualified
+ certificates. They are defined as certificates capable of creating
+ legally binding signatures in the same way as handwritten
+ signatures are. Comments start with a hash mark and empty lines
+ are ignored. Lines do have a length limit but this is not a
+ serious limitation as the format of the entries is fixed and
+ checked by gpgsm: A non-comment line starts with optional
+ whitespace, followed by exactly 40 hex character, white space and a
+ lowercased 2 letter country code. Additional data delimited with
+ by a white space is current ignored but might late be used for
+ other purposes.
+
+ Note that even if a certificate is listed in this file, this does
+ not mean that the certificate is trusted; in general the
+ certificates listed in this file need to be listed also in
+ 'trustlist.txt'.
+
+ This is a global file an installed in the data directory (e.g.
+ '/usr/local/share/gnupg/qualified.txt'). GnuPG installs a suitable
+ file with root certificates as used in Germany. As new Root-CA
+ certificates may be issued over time, these entries may need to be
+ updated; new distributions of this software should come with an
+ updated list but it is still the responsibility of the
+ Administrator to check that this list is correct.
+
+ Everytime 'gpgsm' uses a certificate for signing or verification
+ this file will be consulted to check whether the certificate under
+ question has ultimately been issued by one of these CAs. If this
+ is the case the user will be informed that the verified signature
+ represents a legally binding ("qualified") signature. When
+ creating a signature using such a certificate an extra prompt will
+ be issued to let the user confirm that such a legally binding
+ signature shall really be created.
+
+ Because this software has not yet been approved for use with such
+ certificates, appropriate notices will be shown to indicate this
+ fact.
+
+'help.txt'
+ This is plain text file with a few help entries used with
+ 'pinentry' as well as a large list of help items for 'gpg' and
+ 'gpgsm'. The standard file has English help texts; to install
+ localized versions use filenames like 'help.LL.txt' with LL
+ denoting the locale. GnuPG comes with a set of predefined help
+ files in the data directory (e.g.
+ '/usr/local/share/gnupg/gnupg/help.de.txt') and allows overriding
+ of any help item by help files stored in the system configuration
+ directory (e.g. '/etc/gnupg/help.de.txt'). For a reference of the
+ help file's syntax, please see the installed 'help.txt' file.
+
+'com-certs.pem'
+ This file is a collection of common certificates used to populated
+ a newly created 'pubring.kbx'. An administrator may replace this
+ file with a custom one. The format is a concatenation of PEM
+ encoded X.509 certificates. This global file is installed in the
+ data directory (e.g. '/usr/local/share/gnupg/com-certs.pem').
+
+ Note that on larger installations, it is useful to put predefined
+files into the directory '/etc/skel/.gnupg/' so that newly created users
+start up with a working configuration. For existing users a small
+helper script is provided to create these files (*note addgnupghome::).
+
+ For internal purposes gpgsm creates and maintains a few other files;
+they all live in in the current home directory (*note option
+--homedir::). Only 'gpgsm' may modify these files.
+
+'pubring.kbx'
+ This a database file storing the certificates as well as meta
+ information. For debugging purposes the tool 'kbxutil' may be used
+ to show the internal structure of this file. You should backup
+ this file.
+
+'random_seed'
+ This content of this file is used to maintain the internal state of
+ the random number generator across invocations. The same file is
+ used by other programs of this software too.
+
+'S.gpg-agent'
+ If this file exists 'gpgsm' will first try to connect to this
+ socket for accessing 'gpg-agent' before starting a new 'gpg-agent'
+ instance. Under Windows this socket (which in reality be a plain
+ file describing a regular TCP listening port) is the standard way
+ of connecting the 'gpg-agent'.
+
+
+File: gnupg.info, Node: GPGSM Examples, Next: Unattended Usage, Prev: GPGSM Configuration, Up: Invoking GPGSM
+
+5.4 Examples
+============
+
+ $ gpgsm -er goo at bar.net <plaintext >ciphertext
+
+
+File: gnupg.info, Node: Unattended Usage, Next: GPGSM Protocol, Prev: GPGSM Examples, Up: Invoking GPGSM
+
+5.5 Unattended Usage
+====================
+
+'gpgsm' is often used as a backend engine by other software. To help
+with this a machine interface has been defined to have an unambiguous
+way to do this. This is most likely used with the '--server' command
+but may also be used in the standard operation mode by using the
+'--status-fd' option.
+
+* Menu:
+
+* Automated signature checking:: Automated signature checking.
+* CSR and certificate creation:: CSR and certificate creation.
+
+
+File: gnupg.info, Node: Automated signature checking, Next: CSR and certificate creation, Up: Unattended Usage
+
+5.5.1 Automated signature checking
+----------------------------------
+
+It is very important to understand the semantics used with signature
+verification. Checking a signature is not as simple as it may sound and
+so the operation is a bit complicated. In most cases it is required to
+look at several status lines. Here is a table of all cases a signed
+message may have:
+
+The signature is valid
+ This does mean that the signature has been successfully verified,
+ the certificates are all sane. However there are two subcases with
+ important information: One of the certificates may have expired or
+ a signature of a message itself as expired. It is a sound practise
+ to consider such a signature still as valid but additional
+ information should be displayed. Depending on the subcase 'gpgsm'
+ will issue these status codes:
+ signature valid and nothing did expire
+ 'GOODSIG', 'VALIDSIG', 'TRUST_FULLY'
+ signature valid but at least one certificate has expired
+ 'EXPKEYSIG', 'VALIDSIG', 'TRUST_FULLY'
+ signature valid but expired
+ 'EXPSIG', 'VALIDSIG', 'TRUST_FULLY' Note, that this case is
+ currently not implemented.
+
+The signature is invalid
+ This means that the signature verification failed (this is an
+ indication of af a transfer error, a program error or tampering
+ with the message). 'gpgsm' issues one of these status codes
+ sequences:
+ 'BADSIG'
+ 'GOODSIG, VALIDSIG TRUST_NEVER'
+
+Error verifying a signature
+ For some reason the signature could not be verified, i.e. it
+ cannot be decided whether the signature is valid or invalid. A
+ common reason for this is a missing certificate.
+
+
+File: gnupg.info, Node: CSR and certificate creation, Prev: Automated signature checking, Up: Unattended Usage
+
+5.5.2 CSR and certificate creation
+----------------------------------
+
+The command '--gen-key' may be used along with the option '--batch' to
+either create a certificate signing request (CSR) or an X.509
+certificate. This is controlled by a parameter file; the format of this
+file is as follows:
+
+ * Text only, line length is limited to about 1000 characters.
+ * UTF-8 encoding must be used to specify non-ASCII characters.
+ * Empty lines are ignored.
+ * Leading and trailing while space is ignored.
+ * A hash sign as the first non white space character indicates a
+ comment line.
+ * Control statements are indicated by a leading percent sign, the
+ arguments are separated by white space from the keyword.
+ * Parameters are specified by a keyword, followed by a colon.
+ Arguments are separated by white space.
+ * The first parameter must be 'Key-Type', control statements may be
+ placed anywhere.
+ * The order of the parameters does not matter except for 'Key-Type'
+ which must be the first parameter. The parameters are only used
+ for the generated CSR/certificate; parameters from previous sets
+ are not used. Some syntactically checks may be performed.
+ * Key generation takes place when either the end of the parameter
+ file is reached, the next 'Key-Type' parameter is encountered or at
+ the control statement '%commit' is encountered.
+
+Control statements:
+
+%echo TEXT
+ Print TEXT as diagnostic.
+
+%dry-run
+ Suppress actual key generation (useful for syntax checking).
+
+%commit
+ Perform the key generation. Note that an implicit commit is done
+ at the next Key-Type parameter.
+
+General Parameters:
+
+Key-Type: ALGO
+ Starts a new parameter block by giving the type of the primary key.
+ The algorithm must be capable of signing. This is a required
+ parameter. The only supported value for ALGO is 'rsa'.
+
+Key-Length: NBITS
+ The requested length of a generated key in bits. Defaults to 2048.
+
+Key-Grip: HEXSTRING
+ This is optional and used to generate a CSR or certificatet for an
+ already existing key. Key-Length will be ignored when given.
+
+Key-Usage: USAGE-LIST
+ Space or comma delimited list of key usage, allowed values are
+ 'encrypt', 'sign' and 'cert'. This is used to generate the
+ keyUsage extension. Please make sure that the algorithm is capable
+ of this usage. Default is to allow encrypt and sign.
+
+Name-DN: SUBJECT-NAME
+ This is the Distinguished Name (DN) of the subject in RFC-2253
+ format.
+
+Name-Email: STRING
+ This is an email address for the altSubjectName. This parameter is
+ optional but may occur several times to add several email addresses
+ to a certificate.
+
+Name-DNS: STRING
+ The is an DNS name for the altSubjectName. This parameter is
+ optional but may occur several times to add several DNS names to a
+ certificate.
+
+Name-URI: STRING
+ This is an URI for the altSubjectName. This parameter is optional
+ but may occur several times to add several URIs to a certificate.
+
+Additional parameters used to create a certificate (in contrast to a
+certificate signing request):
+
+Serial: SN
+ If this parameter is given an X.509 certificate will be generated.
+ SN is expected to be a hex string representing an unsigned integer
+ of arbitary length. The special value 'random' can be used to
+ create a 64 bit random serial number.
+
+Issuer-DN: ISSUER-NAME
+ This is the DN name of the issuer in rfc2253 format. If it is not
+ set it will default to the subject DN and a special GnuPG extension
+ will be included in the certificate to mark it as a standalone
+ certificate.
+
+Creation-Date: ISO-DATE
+Not-Before: ISO-DATE
+ Set the notBefore date of the certificate. Either a date like
+ '1986-04-26' or '1986-04-26 12:00' or a standard ISO timestamp like
+ '19860426T042640' may be used. The time is considered to be UTC.
+ If it is not given the current date is used.
+
+Expire-Date: ISO-DATE
+Not-After: ISO-DATE
+ Set the notAfter date of the certificate. Either a date like
+ '2063-04-05' or '2063-04-05 17:00' or a standard ISO timestamp like
+ '20630405T170000' may be used. The time is considered to be UTC.
+ If it is not given a default value in the not too far future is
+ used.
+
+Signing-Key: KEYGRIP
+ This gives the keygrip of the key used to sign the certificate. If
+ it is not given a self-signed certificate will be created. For
+ compatibility with future versions, it is suggested to prefix the
+ keygrip with a '&'.
+
+Hash-Algo: HASH-ALGO
+ Use HASH-ALGO for this CSR or certificate. The supported hash
+ algorithms are: 'sha1', 'sha256', 'sha384' and 'sha512'; they may
+ also be specified with uppercase letters. The default is 'sha256'.
+
+
+File: gnupg.info, Node: GPGSM Protocol, Prev: Unattended Usage, Up: Invoking GPGSM
+
+5.6 The Protocol the Server Mode Uses.
+======================================
+
+Description of the protocol used to access 'GPGSM'. 'GPGSM' does
+implement the Assuan protocol and in addition provides a regular command
+line interface which exhibits a full client to this protocol (but uses
+internal linking). To start 'gpgsm' as a server the command line the
+option '--server' must be used. Additional options are provided to
+select the communication method (i.e. the name of the socket).
+
+ We assume that the connection has already been established; see the
+Assuan manual for details.
+
+* Menu:
+
+* GPGSM ENCRYPT:: Encrypting a message.
+* GPGSM DECRYPT:: Decrypting a message.
+* GPGSM SIGN:: Signing a message.
+* GPGSM VERIFY:: Verifying a message.
+* GPGSM GENKEY:: Generating a key.
+* GPGSM LISTKEYS:: List available keys.
+* GPGSM EXPORT:: Export certificates.
+* GPGSM IMPORT:: Import certificates.
+* GPGSM DELETE:: Delete certificates.
+* GPGSM GETAUDITLOG:: Retrieve an audit log.
+* GPGSM GETINFO:: Information about the process
+* GPGSM OPTION:: Session options.
+
+
+File: gnupg.info, Node: GPGSM ENCRYPT, Next: GPGSM DECRYPT, Up: GPGSM Protocol
+
+5.6.1 Encrypting a Message
+--------------------------
+
+Before encryption can be done the recipient must be set using the
+command:
+
+ RECIPIENT USERID
+
+ Set the recipient for the encryption. USERID should be the internal
+representation of the key; the server may accept any other way of
+specification. If this is a valid and trusted recipient the server does
+respond with OK, otherwise the return is an ERR with the reason why the
+recipient cannot be used, the encryption will then not be done for this
+recipient. If the policy is not to encrypt at all if not all recipients
+are valid, the client has to take care of this. All 'RECIPIENT'
+commands are cumulative until a 'RESET' or an successful 'ENCRYPT'
+command.
+
+ INPUT FD[=N] [--armor|--base64|--binary]
+
+ Set the file descriptor for the message to be encrypted to N.
+Obviously the pipe must be open at that point, the server establishes
+its own end. If the server returns an error the client should consider
+this session failed. If N is not given, this commands uses the last
+file descriptor passed to the application. *Note the assuan_sendfd
+function: (assuan)fun-assuan_sendfd, on how to do descriptor passing.
+
+ The '--armor' option may be used to advice the server that the input
+data is in PEM format, '--base64' advices that a raw base-64 encoding is
+used, '--binary' advices of raw binary input (BER). If none of these
+options is used, the server tries to figure out the used encoding, but
+this may not always be correct.
+
+ OUTPUT FD[=N] [--armor|--base64]
+
+ Set the file descriptor to be used for the output (i.e. the
+encrypted message). Obviously the pipe must be open at that point, the
+server establishes its own end. If the server returns an error he
+client should consider this session failed.
+
+ The option armor encodes the output in PEM format, the '--base64'
+option applies just a base 64 encoding. No option creates binary output
+(BER).
+
+ The actual encryption is done using the command
+
+ ENCRYPT
+
+ It takes the plaintext from the 'INPUT' command, writes to the
+ciphertext to the file descriptor set with the 'OUTPUT' command, take
+the recipients from all the recipients set so far. If this command
+fails the clients should try to delete all output currently done or
+otherwise mark it as invalid. 'GPGSM' does ensure that there will not
+be any security problem with leftover data on the output in this case.
+
+ This command should in general not fail, as all necessary checks have
+been done while setting the recipients. The input and output pipes are
+closed.
+
+
+File: gnupg.info, Node: GPGSM DECRYPT, Next: GPGSM SIGN, Prev: GPGSM ENCRYPT, Up: GPGSM Protocol
+
+5.6.2 Decrypting a message
+--------------------------
+
+Input and output FDs are set the same way as in encryption, but 'INPUT'
+refers to the ciphertext and output to the plaintext. There is no need
+to set recipients. 'GPGSM' automatically strips any S/MIME headers from
+the input, so it is valid to pass an entire MIME part to the INPUT pipe.
+
+ The encryption is done by using the command
+
+ DECRYPT
+
+ It performs the decrypt operation after doing some check on the
+internal state. (e.g. that all needed data has been set). Because it
+utilizes the GPG-Agent for the session key decryption, there is no need
+to ask the client for a protecting passphrase - GpgAgent takes care of
+this by requesting this from the user.
+
+
+File: gnupg.info, Node: GPGSM SIGN, Next: GPGSM VERIFY, Prev: GPGSM DECRYPT, Up: GPGSM Protocol
+
+5.6.3 Signing a Message
+-----------------------
+
+Signing is usually done with these commands:
+
+ INPUT FD[=N] [--armor|--base64|--binary]
+
+ This tells 'GPGSM' to read the data to sign from file descriptor N.
+
+ OUTPUT FD[=M] [--armor|--base64]
+
+ Write the output to file descriptor M. If a detached signature is
+requested, only the signature is written.
+
+ SIGN [--detached]
+
+ Sign the data set with the INPUT command and write it to the sink set
+by OUTPUT. With '--detached', a detached signature is created
+(surprise).
+
+ The key used for signing is the default one or the one specified in
+the configuration file. To get finer control over the keys, it is
+possible to use the command
+
+ SIGNER USERID
+
+ to the signer's key. USERID should be the internal representation of
+the key; the server may accept any other way of specification. If this
+is a valid and trusted recipient the server does respond with OK,
+otherwise the return is an ERR with the reason why the key cannot be
+used, the signature will then not be created using this key. If the
+policy is not to sign at all if not all keys are valid, the client has
+to take care of this. All 'SIGNER' commands are cumulative until a
+'RESET' is done. Note that a 'SIGN' does not reset this list of signers
+which is in contrats to the 'RECIPIENT' command.
+
+
+File: gnupg.info, Node: GPGSM VERIFY, Next: GPGSM GENKEY, Prev: GPGSM SIGN, Up: GPGSM Protocol
+
+5.6.4 Verifying a Message
+-------------------------
+
+To verify a mesage the command:
+
+ VERIFY
+
+ is used. It does a verify operation on the message send to the input
+FD. The result is written out using status lines. If an output FD was
+given, the signed text will be written to that. If the signature is a
+detached one, the server will inquire about the signed material and the
+client must provide it.
+
+
+File: gnupg.info, Node: GPGSM GENKEY, Next: GPGSM LISTKEYS, Prev: GPGSM VERIFY, Up: GPGSM Protocol
+
+5.6.5 Generating a Key
+----------------------
+
+This is used to generate a new keypair, store the secret part in the PSE
+and the public key in the key database. We will probably add optional
+commands to allow the client to select whether a hardware token is used
+to store the key. Configuration options to 'GPGSM' can be used to
+restrict the use of this command.
+
+ GENKEY
+
+ 'GPGSM' checks whether this command is allowed and then does an
+INQUIRY to get the key parameters, the client should then send the key
+parameters in the native format:
+
+ S: INQUIRE KEY_PARAM native
+ C: D foo:fgfgfg
+ C: D bar
+ C: END
+
+ Please note that the server may send Status info lines while reading
+the data lines from the client. After this the key generation takes
+place and the server eventually does send an ERR or OK response. Status
+lines may be issued as a progress indicator.
+
+
+File: gnupg.info, Node: GPGSM LISTKEYS, Next: GPGSM EXPORT, Prev: GPGSM GENKEY, Up: GPGSM Protocol
+
+5.6.6 List available keys
+-------------------------
+
+To list the keys in the internal database or using an external key
+provider, the command:
+
+ LISTKEYS PATTERN
+
+ is used. To allow multiple patterns (which are ORed during the
+search) quoting is required: Spaces are to be translated into "+" or
+into "%20"; in turn this requires that the usual escape quoting rules
+are done.
+
+ LISTSECRETKEYS PATTERN
+
+ Lists only the keys where a secret key is available.
+
+ The list commands commands are affected by the option
+
+ OPTION list-mode=MODE
+
+ where mode may be:
+'0'
+ Use default (which is usually the same as 1).
+'1'
+ List only the internal keys.
+'2'
+ List only the external keys.
+'3'
+ List internal and external keys.
+
+ Note that options are valid for the entire session.
+
+
+File: gnupg.info, Node: GPGSM EXPORT, Next: GPGSM IMPORT, Prev: GPGSM LISTKEYS, Up: GPGSM Protocol
+
+5.6.7 Export certificates
+-------------------------
+
+To export certificate from the internal key database the command:
+
+ EXPORT [--data [--armor] [--base64]] [--] PATTERN
+
+ is used. To allow multiple patterns (which are ORed) quoting is
+required: Spaces are to be translated into "+" or into "%20"; in turn
+this requires that the usual escape quoting rules are done.
+
+ If the '--data' option has not been given, the format of the output
+depends on what was set with the OUTPUT command. When using PEM
+encoding a few informational lines are prepended.
+
+ If the '--data' has been given, a target set via OUTPUT is ignored
+and the data is returned inline using standard 'D'-lines. This avoids
+the need for an extra file descriptor. In this case the options
+'--armor' and '--base64' may be used in the same way as with the OUTPUT
+command.
+
+
+File: gnupg.info, Node: GPGSM IMPORT, Next: GPGSM DELETE, Prev: GPGSM EXPORT, Up: GPGSM Protocol
+
+5.6.8 Import certificates
+-------------------------
+
+To import certificates into the internal key database, the command
+
+ IMPORT [--re-import]
+
+ is used. The data is expected on the file descriptor set with the
+'INPUT' command. Certain checks are performed on the certificate. Note
+that the code will also handle PKCS#12 files and import private keys; a
+helper program is used for that.
+
+ With the option '--re-import' the input data is expected to a be a
+linefeed separated list of fingerprints. The command will re-import the
+corresponding certificates; that is they are made permanent by removing
+their ephemeral flag.
+
+
+File: gnupg.info, Node: GPGSM DELETE, Next: GPGSM GETAUDITLOG, Prev: GPGSM IMPORT, Up: GPGSM Protocol
+
+5.6.9 Delete certificates
+-------------------------
+
+To delete a certificate the command
+
+ DELKEYS PATTERN
+
+ is used. To allow multiple patterns (which are ORed) quoting is
+required: Spaces are to be translated into "+" or into "%20"; in turn
+this requires that the usual escape quoting rules are done.
+
+ The certificates must be specified unambiguously otherwise an error
+is returned.
+
+
+File: gnupg.info, Node: GPGSM GETAUDITLOG, Next: GPGSM GETINFO, Prev: GPGSM DELETE, Up: GPGSM Protocol
+
+5.6.10 Retrieve an audit log.
+-----------------------------
+
+This command is used to retrieve an audit log.
+
+ GETAUDITLOG [--data] [--html]
+
+ If '--data' is used, the audit log is send using D-lines instead of
+being sent to the file descriptor given by an OUTPUT command. If
- '--html' is used, the output is formated as an XHTML block. This is
++'--html' is used, the output is formatted as an XHTML block. This is
+designed to be incorporated into a HTML document.
+
+
+File: gnupg.info, Node: GPGSM GETINFO, Next: GPGSM OPTION, Prev: GPGSM GETAUDITLOG, Up: GPGSM Protocol
+
+5.6.11 Return information about the process
+-------------------------------------------
+
+This is a multipurpose function to return a variety of information.
+
+ GETINFO WHAT
+
+ The value of WHAT specifies the kind of information returned:
+'version'
+ Return the version of the program.
+'pid'
+ Return the process id of the process.
+'agent-check'
+ Return OK if the agent is running.
+'cmd_has_option CMD OPT'
+ Return OK if the command CMD implements the option OPT. The
+ leading two dashes usually used with OPT shall not be given.
+'offline'
+ Return OK if the connection is in offline mode. This may be either
+ due to a 'OPTION offline=1' or due to 'gpgsm' being started with
+ option '--disable-dirmngr'.
+
+
+File: gnupg.info, Node: GPGSM OPTION, Prev: GPGSM GETINFO, Up: GPGSM Protocol
+
+5.6.12 Session options.
+-----------------------
+
+The standard Assuan option handler supports these options.
+
+ OPTION NAME[=VALUE]
+
+ These NAMEs are recognized:
+
+'putenv'
+ Change the session's environment to be passed via gpg-agent to
+ Pinentry. VALUE is a string of the form '<KEY>[=[<STRING>]]'. If
+ only '<KEY>' is given the environment variable '<KEY>' is removed
+ from the session environment, if '<KEY>=' is given that environment
+ variable is set to the empty string, and if '<STRING>' is given it
+ is set to that string.
+
+'display'
+ Set the session environment variable 'DISPLAY' is set to VALUE.
+'ttyname'
+ Set the session environment variable 'GPG_TTY' is set to VALUE.
+'ttytype'
+ Set the session environment variable 'TERM' is set to VALUE.
+'lc-ctype'
+ Set the session environment variable 'LC_CTYPE' is set to VALUE.
+'lc-messages'
+ Set the session environment variable 'LC_MESSAGES' is set to VALUE.
+'xauthority'
+ Set the session environment variable 'XAUTHORITY' is set to VALUE.
+'pinentry-user-data'
+ Set the session environment variable 'PINENTRY_USER_DATA' is set to
+ VALUE.
+
+'include-certs'
+ This option overrides the command line option '--include-certs'. A
+ VALUE of -2 includes all certificates except for the root
+ certificate, -1 includes all certicates, 0 does not include any
+ certicates, 1 includes only the signers certicate and all other
+ positive values include up to VALUE certificates starting with the
+ signer cert.
+
+'list-mode'
+ *Note gpgsm-cmd listkeys::.
+
+'list-to-output'
+ If VALUE is true the output of the list commands (*note gpgsm-cmd
+ listkeys::) is written to the file descriptor set with the last
+ OUTPUT command. If VALUE is false the output is written via data
+ lines; this is the default.
+
+'with-validation'
+ If VALUE is true for each listed certificate the validation status
+ is printed. This may result in the download of a CRL or the user
+ being asked about the trustworthiness of a root certificate. The
+ default is given by a command line option (*note gpgsm-option
+ --with-validation::).
+
+'with-secret'
+ If VALUE is true certificates with a corresponding private key are
+ marked by the list commands.
+
+'validation-model'
+ This option overrides the command line option 'validation-model'
+ for the session. (*note gpgsm-option --validation-model::.)
+
+'with-key-data'
+ This option globally enables the command line option
+ '--with-key-data'. (*note gpgsm-option --with-key-data::.)
+
+'enable-audit-log'
+ If VALUE is true data to write an audit log is gathered. (*note
+ gpgsm-cmd getauditlog::.)
+
+'allow-pinentry-notify'
+ If this option is used notifications about the launch of a Pinentry
+ are passed back to the client.
+
+'with-ephemeral-keys'
+ If VALUE is true ephemeral certificates are included in the output
+ of the list commands.
+
+'no-encrypt-to'
+ If this option is used all keys set by the command line option
+ '--encrypt-to' are ignored.
+
+'offline'
+ If VALUE is true or VALUE is not given all network access is
+ disabled for this session. This is the same as the command line
+ option '--disable-dirmngr'.
+
+
+File: gnupg.info, Node: Invoking SCDAEMON, Next: Specify a User ID, Prev: Invoking GPGSM, Up: Top
+
+6 Invoking the SCDAEMON
+***********************
+
+The 'scdaemon' is a daemon to manage smartcards. It is usually invoked
+by 'gpg-agent' and in general not used directly.
+
+ *Note Option Index::, for an index to 'scdaemon''s commands and
+options.
+
+* Menu:
+
+* Scdaemon Commands:: List of all commands.
+* Scdaemon Options:: List of all options.
+* Card applications:: Description of card applications.
+* Scdaemon Configuration:: Configuration files.
+* Scdaemon Examples:: Some usage examples.
+* Scdaemon Protocol:: The protocol the daemon uses.
+
+
+File: gnupg.info, Node: Scdaemon Commands, Next: Scdaemon Options, Up: Invoking SCDAEMON
+
+6.1 Commands
+============
+
+Commands are not distinguished from options except for the fact that
+only one command is allowed.
+
+'--version'
+ Print the program version and licensing information. Not that you
+ can abbreviate this command.
+
+'--help, -h'
+ Print a usage message summarizing the most useful command-line
+ options. Not that you can abbreviate this command.
+
+'--dump-options'
+ Print a list of all available options and commands. Not that you
+ can abbreviate this command.
+
+'--server'
+ Run in server mode and wait for commands on the 'stdin'. This is
+ default mode is to create a socket and listen for commands there.
+
+'--multi-server'
+ Run in server mode and wait for commands on the 'stdin' as well as
+ on an additional Unix Domain socket. The server command 'GETINFO'
+ may be used to get the name of that extra socket.
+
+'--daemon'
+ Run the program in the background. This option is required to
+ prevent it from being accidentally running in the background.
+
+
+File: gnupg.info, Node: Scdaemon Options, Next: Card applications, Prev: Scdaemon Commands, Up: Invoking SCDAEMON
+
+6.2 Option Summary
+==================
+
+'--options FILE'
+ Reads configuration from FILE instead of from the default per-user
+ configuration file. The default configuration file is named
+ 'scdaemon.conf' and expected in the '.gnupg' directory directly
+ below the home directory of the user.
+
+'--homedir DIR'
+ Set the name of the home directory to DIR. If this option is not
+ used, the home directory defaults to '~/.gnupg'. It is only
+ recognized when given on the command line. It also overrides any
+ home directory stated through the environment variable 'GNUPGHOME'
+ or (on Windows systems) by means of the Registry entry
+ HKCU\SOFTWARE\GNU\GNUPG:HOMEDIR.
+
+ On Windows systems it is possible to install GnuPG as a portable
+ application. In this case only this command line option is
+ considered, all other ways to set a home directory are ignored.
+
+ To install GnuPG as a portable application under Windows, create an
+ empty file name 'gpgconf.ctl' in the same directory as the tool
+ 'gpgconf.exe'. The root of the installation is than that
+ directory; or, if 'gpgconf.exe' has been installed directly below a
+ directory named 'bin', its parent directory. You also need to make
+ sure that the following directories exist and are writable:
+ 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ for internal cache files.
+
+'-v'
+'--verbose'
+ Outputs additional information while running. You can increase the
+ verbosity by giving several verbose commands to 'gpgsm', such as
+ '-vv'.
+
+'--debug-level LEVEL'
+ Select the debug level for investigating problems. LEVEL may be a
+ numeric value or a keyword:
+
+ 'none'
+ No debugging at all. A value of less than 1 may be used
+ instead of the keyword.
+ 'basic'
+ Some basic debug messages. A value between 1 and 2 may be
+ used instead of the keyword.
+ 'advanced'
+ More verbose debug messages. A value between 3 and 5 may be
+ used instead of the keyword.
+ 'expert'
+ Even more detailed messages. A value between 6 and 8 may be
+ used instead of the keyword.
+ 'guru'
+ All of the debug messages you can get. A value greater than 8
+ may be used instead of the keyword. The creation of hash
+ tracing files is only enabled if the keyword is used.
+
+ How these messages are mapped to the actual debugging flags is not
+ specified and may change with newer releases of this program. They
+ are however carefully selected to best aid in debugging.
+
+ Note: All debugging options are subject to change and thus
+ should not be used by any application program. As the name
+ says, they are only used as helpers to debug problems.
+
+'--debug FLAGS'
+ This option is only useful for debugging and the behaviour may
+ change at any time without notice. FLAGS are bit encoded and may
+ be given in usual C-Syntax. The currently defined bits are:
+
+ '0 (1)'
+ command I/O
+ '1 (2)'
+ values of big number integers
+ '2 (4)'
+ low level crypto operations
+ '5 (32)'
+ memory allocation
+ '6 (64)'
+ caching
+ '7 (128)'
+ show memory statistics.
+ '9 (512)'
+ write hashed data to files named 'dbgmd-000*'
+ '10 (1024)'
+ trace Assuan protocol. See also option
+ '--debug-assuan-log-cats'.
+ '11 (2048)'
+ trace APDU I/O to the card. This may reveal sensitive data.
+ '12 (4096)'
+ trace some card reader related function calls.
+
+'--debug-all'
+ Same as '--debug=0xffffffff'
+
+'--debug-wait N'
+ When running in server mode, wait N seconds before entering the
+ actual processing loop and print the pid. This gives time to
+ attach a debugger.
+
+'--debug-ccid-driver'
+ Enable debug output from the included CCID driver for smartcards.
+ Using this option twice will also enable some tracing of the T=1
+ protocol. Note that this option may reveal sensitive data.
+
+'--debug-disable-ticker'
+ This option disables all ticker functions like checking for card
+ insertions.
+
+'--debug-allow-core-dump'
+ For security reasons we won't create a core dump when the process
+ aborts. For debugging purposes it is sometimes better to allow
+ core dump. This options enables it and also changes the working
+ directory to '/tmp' when running in '--server' mode.
+
+'--debug-log-tid'
+ This option appends a thread ID to the PID in the log output.
+
+'--debug-assuan-log-cats CATS'
+ Changes the active Libassuan logging categories to CATS. The value
+ for CATS is an unsigned integer given in usual C-Syntax. A value
+ of of 0 switches to a default category. If this option is not used
+ the categories are taken from the environment variable
+ 'ASSUAN_DEBUG'. Note that this option has only an effect if the
+ Assuan debug flag has also been with the option '--debug'. For a
+ list of categories see the Libassuan manual.
+
+'--no-detach'
+ Don't detach the process from the console. This is mainly useful
+ for debugging.
+
+'--log-file FILE'
+ Append all logging output to FILE. This is very helpful in seeing
+ what the agent actually does.
+
+'--pcsc-driver LIBRARY'
+ Use LIBRARY to access the smartcard reader. The current default is
+ 'libpcsclite.so'. Instead of using this option you might also want
+ to install a symbolic link to the default file name (e.g. from
+ 'libpcsclite.so.1').
+
+'--ctapi-driver LIBRARY'
+ Use LIBRARY to access the smartcard reader. The current default is
+ 'libtowitoko.so'. Note that the use of this interface is
+ deprecated; it may be removed in future releases.
+
+'--disable-ccid'
+ Disable the integrated support for CCID compliant readers. This
- allows to fall back to one of the other drivers even if the
++ allows falling back to one of the other drivers even if the
+ internal CCID driver can handle the reader. Note, that CCID
+ support is only available if libusb was available at build time.
+
+'--reader-port NUMBER_OR_STRING'
+ This option may be used to specify the port of the card terminal.
+ A value of 0 refers to the first serial device; add 32768 to access
+ USB devices. The default is 32768 (first USB device). PC/SC or
+ CCID readers might need a string here; run the program in verbose
+ mode to get a list of available readers. The default is then the
+ first reader found.
+
+ To get a list of available CCID readers you may use this command:
+ echo scd getinfo reader_list \
+ | gpg-connect-agent --decode | awk '/^D/ {print $2}'
+
+'--card-timeout N'
+ If N is not 0 and no client is actively using the card, the card
+ will be powered down after N seconds. Powering down the card
+ avoids a potential risk of damaging a card when used with certain
- cheap readers. This also allows non Scdaemon aware applications to
- access the card. The disadvantage of using a card timeout is that
- accessing the card takes longer and that the user needs to enter
- the PIN again after the next power up.
++ cheap readers. This also allows applications that are not aware of
++ Scdaemon to access the card. The disadvantage of using a card
++ timeout is that accessing the card takes longer and that the user
++ needs to enter the PIN again after the next power up.
+
+ Note that with the current version of Scdaemon the card is powered
+ down immediately at the next timer tick for any value of N other
+ than 0.
+
+'--enable-pinpad-varlen'
+ Please specify this option when the card reader supports variable
+ length input for pinpad (default is no). For known readers (listed
+ in ccid-driver.c and apdu.c), this option is not needed. Note that
+ if your card reader doesn't supports variable length input but you
+ want to use it, you need to specify your pinpad request on your
+ card.
+
+'--disable-pinpad'
+ Even if a card reader features a pinpad, do not try to use it.
+
+'--deny-admin'
+ This option disables the use of admin class commands for card
+ applications where this is supported. Currently we support it for
+ the OpenPGP card. This commands is useful to inhibit accidental
+ access to admin class command which could ultimately lock the card
+ through wrong PIN numbers. Note that GnuPG versions older than
+ 2.0.11 featured an '--allow-admin' command which was required to
+ use such admin commands. This option has no more effect today
+ because the default is now to allow admin commands.
+
+'--disable-application NAME'
+ This option disables the use of the card application named NAME.
+ This is mainly useful for debugging or if a application with lower
+ priority should be used by default.
+
+ All the long options may also be given in the configuration file
+after stripping off the two leading dashes.
+
+
+File: gnupg.info, Node: Card applications, Next: Scdaemon Configuration, Prev: Scdaemon Options, Up: Invoking SCDAEMON
+
+6.3 Description of card applications
+====================================
+
+'scdaemon' supports the card applications as described below.
+
+* Menu:
+
+* OpenPGP Card:: The OpenPGP card application
+* NKS Card:: The Telesec NetKey card application
+* DINSIG Card:: The DINSIG card application
+* PKCS#15 Card:: The PKCS#15 card application
+* Geldkarte Card:: The Geldkarte application
+* SmartCard-HSM:: The SmartCard-HSM application
+* Undefined Card:: The Undefined stub application
+
+
+File: gnupg.info, Node: OpenPGP Card, Next: NKS Card, Up: Card applications
+
+6.3.1 The OpenPGP card application "openpgp"
+--------------------------------------------
+
+This application is currently only used by 'gpg' but may in future also
+be useful with 'gpgsm'. Version 1 and version 2 of the card is
+supported.
+
+The specifications for these cards are available at
+<http://g10code.com/docs/openpgp-card-1.0.pdf> and
+<http://g10code.com/docs/openpgp-card-2.0.pdf>.
+
+
+File: gnupg.info, Node: NKS Card, Next: DINSIG Card, Prev: OpenPGP Card, Up: Card applications
+
+6.3.2 The Telesec NetKey card "nks"
+-----------------------------------
+
+This is the main application of the Telesec cards as available in
+Germany. It is a superset of the German DINSIG card. The card is used
+by 'gpgsm'.
+
+
+File: gnupg.info, Node: DINSIG Card, Next: PKCS#15 Card, Prev: NKS Card, Up: Card applications
+
+6.3.3 The DINSIG card application "dinsig"
+------------------------------------------
+
+This is an application as described in the German draft standard _DIN V
+66291-1_. It is intended to be used by cards supporting the German
+signature law and its bylaws (SigG and SigV).
+
+
+File: gnupg.info, Node: PKCS#15 Card, Next: Geldkarte Card, Prev: DINSIG Card, Up: Card applications
+
+6.3.4 The PKCS#15 card application "p15"
+----------------------------------------
+
+This is common framework for smart card applications. It is used by
+'gpgsm'.
+
+
+File: gnupg.info, Node: Geldkarte Card, Next: SmartCard-HSM, Prev: PKCS#15 Card, Up: Card applications
+
+6.3.5 The Geldkarte card application "geldkarte"
+------------------------------------------------
+
+This is a simple application to display information of a German
+Geldkarte. The Geldkarte is a small amount debit card application which
+comes with almost all German banking cards.
+
+
+File: gnupg.info, Node: SmartCard-HSM, Next: Undefined Card, Prev: Geldkarte Card, Up: Card applications
+
+6.3.6 The SmartCard-HSM card application "sc-hsm"
+-------------------------------------------------
+
+This application adds read/only support for keys and certificates stored
+on a SmartCard-HSM (http://www.smartcard-hsm.com).
+
+ To generate keys and store certifiates you may use OpenSC
+(https://github.com/OpenSC/OpenSC/wiki/SmartCardHSM) or the tools from
+OpenSCDP (http://www.openscdp.org).
+
+ The SmartCard-HSM cards requires a card reader that supports Extended
+Length APDUs.
+
+
+File: gnupg.info, Node: Undefined Card, Prev: SmartCard-HSM, Up: Card applications
+
+6.3.7 The Undefined card application "undefined"
+------------------------------------------------
+
+This is a stub application to allow the use of the APDU command even if
+no supported application is found on the card. This application is not
+used automatically but must be explicitly requested using the SERIALNO
+command.
+
+
+File: gnupg.info, Node: Scdaemon Configuration, Next: Scdaemon Examples, Prev: Card applications, Up: Invoking SCDAEMON
+
+6.4 Configuration files
+=======================
+
+There are a few configuration files to control certain aspects of
+'scdaemons''s operation. Unless noted, they are expected in the current
+home directory (*note option --homedir::).
+
+'scdaemon.conf'
+ This is the standard configuration file read by 'scdaemon' on
+ startup. It may contain any valid long option; the leading two
+ dashes may not be entered and the option may not be abbreviated.
+ This default name may be changed on the command line (*note option
+ --options::).
+
+'scd-event'
+ If this file is present and executable, it will be called on veyer
+ card reader's status changed. An example of this script is
+ provided with the distribution
+
+'reader_N.status'
+ This file is created by 'sdaemon' to let other applications now
+ about reader status changes. Its use is now deprecated in favor of
+ 'scd-event'.
+
+
+File: gnupg.info, Node: Scdaemon Examples, Next: Scdaemon Protocol, Prev: Scdaemon Configuration, Up: Invoking SCDAEMON
+
+6.5 Examples
+============
+
+ $ scdaemon --server -v
+
+
+File: gnupg.info, Node: Scdaemon Protocol, Prev: Scdaemon Examples, Up: Invoking SCDAEMON
+
+6.6 Scdaemon's Assuan Protocol
+==============================
+
+The SC-Daemon should be started by the system to provide access to
+external tokens. Using Smartcards on a multi-user system does not make
+much sense expect for system services, but in this case no regular user
+accounts are hosted on the machine.
+
+ A client connects to the SC-Daemon by connecting to the socket named
+'/usr/local/var/run/gnupg/scdaemon/socket', configuration information is
+read from /ETC/GNUPG/SCDAEMON.CONF
+
+ Each connection acts as one session, SC-Daemon takes care of
+synchronizing access to a token between sessions.
+
+* Menu:
+
+* Scdaemon SERIALNO:: Return the serial number.
+* Scdaemon LEARN:: Read all useful information from the card.
+* Scdaemon READCERT:: Return a certificate.
+* Scdaemon READKEY:: Return a public key.
+* Scdaemon PKSIGN:: Signing data with a Smartcard.
+* Scdaemon PKDECRYPT:: Decrypting data with a Smartcard.
+* Scdaemon GETATTR:: Read an attribute's value.
+* Scdaemon SETATTR:: Update an attribute's value.
+* Scdaemon WRITEKEY:: Write a key to a card.
+* Scdaemon GENKEY:: Generate a new key on-card.
+* Scdaemon RANDOM:: Return random bytes generate on-card.
+* Scdaemon PASSWD:: Change PINs.
+* Scdaemon CHECKPIN:: Perform a VERIFY operation.
+* Scdaemon RESTART:: Restart connection
+* Scdaemon APDU:: Send a verbatim APDU to the card
+
+
+File: gnupg.info, Node: Scdaemon SERIALNO, Next: Scdaemon LEARN, Up: Scdaemon Protocol
+
+6.6.1 Return the serial number
+------------------------------
+
+This command should be used to check for the presence of a card. It is
+special in that it can be used to reset the card. Most other commands
+will return an error when a card change has been detected and the use of
+this function is therefore required.
+
+ Background: We want to keep the client clear of handling card changes
+between operations; i.e. the client can assume that all operations are
+done on the same card unless he call this function.
+
+ SERIALNO
+
+ Return the serial number of the card using a status response like:
+
+ S SERIALNO D27600000000000000000000 0
+
+ The trailing 0 should be ignored for now, it is reserved for a future
+extension. The serial number is the hex encoded value identified by the
+'0x5A' tag in the GDO file (FIX=0x2F02).
+
+
+File: gnupg.info, Node: Scdaemon LEARN, Next: Scdaemon READCERT, Prev: Scdaemon SERIALNO, Up: Scdaemon Protocol
+
+6.6.2 Read all useful information from the card
+-----------------------------------------------
+
+ LEARN [--force]
+
+ Learn all useful information of the currently inserted card. When
+used without the force options, the command might do an INQUIRE like
+this:
+
+ INQUIRE KNOWNCARDP <hexstring_with_serialNumber> <timestamp>
+
+ The client should just send an 'END' if the processing should go on
+or a 'CANCEL' to force the function to terminate with a cancel error
+message. The response of this command is a list of status lines
+formatted as this:
+
+ S KEYPAIRINFO HEXSTRING_WITH_KEYGRIP HEXSTRING_WITH_ID
+
+ If there is no certificate yet stored on the card a single "X" is
+returned in HEXSTRING_WITH_KEYGRIP.
+
+
+File: gnupg.info, Node: Scdaemon READCERT, Next: Scdaemon READKEY, Prev: Scdaemon LEARN, Up: Scdaemon Protocol
+
+6.6.3 Return a certificate
+--------------------------
+
+ READCERT HEXIFIED_CERTID|KEYID
+
+ This function is used to read a certificate identified by
+HEXIFIED_CERTID from the card. With OpenPGP cards the keyid 'OpenPGP.3'
+may be used to rad the certificate of version 2 cards.
+
+
+File: gnupg.info, Node: Scdaemon READKEY, Next: Scdaemon PKSIGN, Prev: Scdaemon READCERT, Up: Scdaemon Protocol
+
+6.6.4 Return a public key
+-------------------------
+
+ READKEY HEXIFIED_CERTID
+
+ Return the public key for the given cert or key ID as an standard
+S-Expression.
+
+
+File: gnupg.info, Node: Scdaemon PKSIGN, Next: Scdaemon PKDECRYPT, Prev: Scdaemon READKEY, Up: Scdaemon Protocol
+
+6.6.5 Signing data with a Smartcard
+-----------------------------------
+
+To sign some data the caller should use the command
+
+ SETDATA HEXSTRING
+
+ to tell 'scdaemon' about the data to be signed. The data must be
+given in hex notation. The actual signing is done using the command
+
+ PKSIGN KEYID
+
+ where KEYID is the hexified ID of the key to be used. The key id may
+have been retrieved using the command 'LEARN'. If another hash
+algorithm than SHA-1 is used, that algorithm may be given like:
+
+ PKSIGN --hash=ALGONAME KEYID
+
+ With ALGONAME are one of 'sha1', 'rmd160' or 'md5'.
+
+
+File: gnupg.info, Node: Scdaemon PKDECRYPT, Next: Scdaemon GETATTR, Prev: Scdaemon PKSIGN, Up: Scdaemon Protocol
+
+6.6.6 Decrypting data with a Smartcard
+--------------------------------------
+
+To decrypt some data the caller should use the command
+
+ SETDATA HEXSTRING
+
+ to tell 'scdaemon' about the data to be decrypted. The data must be
+given in hex notation. The actual decryption is then done using the
+command
+
+ PKDECRYPT KEYID
+
+ where KEYID is the hexified ID of the key to be used.
+
+ If the card is ware of the apdding format a status line with padding
+information is send before the plaintext data. The key for this status
+line is 'PADDING' with the only defined value being 0 and meaning
+padding has been removed.
+
+
+File: gnupg.info, Node: Scdaemon GETATTR, Next: Scdaemon SETATTR, Prev: Scdaemon PKDECRYPT, Up: Scdaemon Protocol
+
+6.6.7 Read an attribute's value.
+--------------------------------
+
+TO BE WRITTEN.
+
+
+File: gnupg.info, Node: Scdaemon SETATTR, Next: Scdaemon WRITEKEY, Prev: Scdaemon GETATTR, Up: Scdaemon Protocol
+
+6.6.8 Update an attribute's value.
+----------------------------------
+
+TO BE WRITTEN.
+
+
+File: gnupg.info, Node: Scdaemon WRITEKEY, Next: Scdaemon GENKEY, Prev: Scdaemon SETATTR, Up: Scdaemon Protocol
+
+6.6.9 Write a key to a card.
+----------------------------
+
+ WRITEKEY [--force] KEYID
+
+ This command is used to store a secret key on a smartcard. The
+allowed keyids depend on the currently selected smartcard application.
+The actual keydata is requested using the inquiry 'KEYDATA' and need to
+be provided without any protection. With '--force' set an existing key
+under this KEYID will get overwritten. The key data is expected to be
+the usual canonical encoded S-expression.
+
+ A PIN will be requested in most cases. This however depends on the
+actual card application.
+
+
+File: gnupg.info, Node: Scdaemon GENKEY, Next: Scdaemon RANDOM, Prev: Scdaemon WRITEKEY, Up: Scdaemon Protocol
+
+6.6.10 Generate a new key on-card.
+----------------------------------
+
+TO BE WRITTEN.
+
+
+File: gnupg.info, Node: Scdaemon RANDOM, Next: Scdaemon PASSWD, Prev: Scdaemon GENKEY, Up: Scdaemon Protocol
+
+6.6.11 Return random bytes generate on-card.
+--------------------------------------------
+
+TO BE WRITTEN.
+
+
+File: gnupg.info, Node: Scdaemon PASSWD, Next: Scdaemon CHECKPIN, Prev: Scdaemon RANDOM, Up: Scdaemon Protocol
+
+6.6.12 Change PINs.
+-------------------
+
+ PASSWD [--reset] [--nullpin] CHVNO
+
+ Change the PIN or reset the retry counter of the card holder
+verification vector number CHVNO. The option '--nullpin' is used to
+initialize the PIN of TCOS cards (6 byte NullPIN only).
+
+
+File: gnupg.info, Node: Scdaemon CHECKPIN, Next: Scdaemon RESTART, Prev: Scdaemon PASSWD, Up: Scdaemon Protocol
+
+6.6.13 Perform a VERIFY operation.
+----------------------------------
+
+ CHECKPIN IDSTR
+
+ Perform a VERIFY operation without doing anything else. This may be
+used to initialize a the PIN cache earlier to long lasting operations.
+Its use is highly application dependent:
+
+*OpenPGP*
+
+ Perform a simple verify operation for CHV1 and CHV2, so that
+ further operations won't ask for CHV2 and it is possible to do a
+ cheap check on the PIN: If there is something wrong with the PIN
+ entry system, only the regular CHV will get blocked and not the
+ dangerous CHV3. IDSTR is the usual card's serial number in hex
+ notation; an optional fingerprint part will get ignored.
+
+ There is however a special mode if IDSTR is suffixed with the
+ literal string '[CHV3]': In this case the Admin PIN is checked if
+ and only if the retry counter is still at 3.
+
+
+File: gnupg.info, Node: Scdaemon RESTART, Next: Scdaemon APDU, Prev: Scdaemon CHECKPIN, Up: Scdaemon Protocol
+
+6.6.14 Perform a RESTART operation.
+-----------------------------------
+
+ RESTART
+
+ Restart the current connection; this is a kind of warm reset. It
+deletes the context used by this connection but does not actually reset
+the card.
+
+ This is used by gpg-agent to reuse a primary pipe connection and may
+be used by clients to backup from a conflict in the serial command; i.e.
+to select another application.
+
diff --cc doc/gnupg.info-2
index 2879321,0000000..b775263
mode 100644,000000..100644
--- a/doc/gnupg.info-2
+++ b/doc/gnupg.info-2
@@@ -1,4324 -1,0 +1,4326 @@@
+This is gnupg.info, produced by makeinfo version 5.2 from gnupg.texi.
+
- This is the 'The GNU Privacy Guard Manual' (version 2.1.14, July 2016).
++This is the 'The GNU Privacy Guard Manual' (version 2.1.15, August
++2016).
+
+ (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
+(C) 2013, 2014, 2015 Werner Koch.
+(C) 2015 g10 Code GmbH.
+
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 3 of the
+ License, or (at your option) any later version. The text of the
+ license can be found in the section entitled "Copying".
+INFO-DIR-SECTION GNU Utilities
+START-INFO-DIR-ENTRY
+* gpg2: (gnupg). OpenPGP encryption and signing tool.
+* gpgsm: (gnupg). S/MIME encryption and signing tool.
+* gpg-agent: (gnupg). The secret key daemon.
+* dirmngr: (gnupg). X.509 CRL and OCSP server.
+* dirmngr-client: (gnupg). X.509 CRL and OCSP client.
+END-INFO-DIR-ENTRY
+
+
+File: gnupg.info, Node: Scdaemon APDU, Prev: Scdaemon RESTART, Up: Scdaemon Protocol
+
+6.6.15 Send a verbatim APDU to the card.
+----------------------------------------
+
+ APDU [--atr] [--more] [--exlen[=N]] [HEXSTRING]
+
+ Send an APDU to the current reader. This command bypasses the high
+level functions and sends the data directly to the card. HEXSTRING is
+expected to be a proper APDU. If HEXSTRING is not given no commands are
+send to the card; However the command will implicitly check whether the
+card is ready for use.
+
+ Using the option '--atr' returns the ATR of the card as a status
+message before any data like this:
+ S CARD-ATR 3BFA1300FF813180450031C173C00100009000B1
+
+ Using the option '--more' handles the card status word MORE_DATA
+(61xx) and concatenate all responses to one block.
+
+ Using the option '--exlen' the returned APDU may use extended length
+up to N bytes. If N is not given a default value is used (currently
+4096).
+
+
+File: gnupg.info, Node: Specify a User ID, Next: Helper Tools, Prev: Invoking SCDAEMON, Up: Top
+
+7 How to Specify a User Id
+**************************
+
+There are different ways to specify a user ID to GnuPG. Some of them are
+only valid for 'gpg' others are only good for 'gpgsm'. Here is the
+entire list of ways to specify a key:
+
+ * By key Id. This format is deduced from the length of the string
+ and its content or '0x' prefix. The key Id of an X.509 certificate
+ are the low 64 bits of its SHA-1 fingerprint. The use of key Ids
+ is just a shortcut, for all automated processing the fingerprint
+ should be used.
+
+ When using 'gpg' an exclamation mark (!) may be appended to force
+ using the specified primary or secondary key and not to try and
+ calculate which primary or secondary key to use.
+
+ The last four lines of the example give the key ID in their long
+ form as internally used by the OpenPGP protocol. You can see the
+ long key ID using the option '--with-colons'.
+
+ 234567C4
+ 0F34E556E
+ 01347A56A
+ 0xAB123456
+
+ 234AABBCC34567C4
+ 0F323456784E56EAB
+ 01AB3FED1347A5612
+ 0x234AABBCC34567C4
+
+ * By fingerprint. This format is deduced from the length of the
+ string and its content or the '0x' prefix. Note, that only the 20
+ byte version fingerprint is available with 'gpgsm' (i.e. the SHA-1
+ hash of the certificate).
+
+ When using 'gpg' an exclamation mark (!) may be appended to force
+ using the specified primary or secondary key and not to try and
+ calculate which primary or secondary key to use.
+
+ The best way to specify a key Id is by using the fingerprint. This
+ avoids any ambiguities in case that there are duplicated key IDs.
+
+ 1234343434343434C434343434343434
+ 123434343434343C3434343434343734349A3434
+ 0E12343434343434343434EAB3484343434343434
+ 0xE12343434343434343434EAB3484343434343434
+
+ 'gpgsm' also accepts colons between each pair of hexadecimal digits
+ because this is the de-facto standard on how to present X.509
+ fingerprints. 'gpg' also allows the use of the space separated
+ SHA-1 fingerprint as printed by the key listing commands.
+
+ * By exact match on OpenPGP user ID. This is denoted by a leading
+ equal sign. It does not make sense for X.509 certificates.
+
+ =Heinrich Heine <heinrichh at uni-duesseldorf.de>
+
+ * By exact match on an email address. This is indicated by enclosing
+ the email address in the usual way with left and right angles.
+
+ <heinrichh at uni-duesseldorf.de>
+
+ * By partial match on an email address. This is indicated by
+ prefixing the search string with an '@'. This uses a substring
+ search but considers only the mail address (i.e. inside the angle
+ brackets).
+
+ @heinrichh
+
+ * By exact match on the subject's DN. This is indicated by a leading
+ slash, directly followed by the RFC-2253 encoded DN of the subject.
+ Note that you can't use the string printed by "gpgsm -list-keys"
+ because that one as been reordered and modified for better
+ readability; use -with-colons to print the raw (but standard
+ escaped) RFC-2253 string
+
+ /CN=Heinrich Heine,O=Poets,L=Paris,C=FR
+
+ * By exact match on the issuer's DN. This is indicated by a leading
+ hash mark, directly followed by a slash and then directly followed
+ by the rfc2253 encoded DN of the issuer. This should return the
+ Root cert of the issuer. See note above.
+
+ #/CN=Root Cert,O=Poets,L=Paris,C=FR
+
+ * By exact match on serial number and issuer's DN. This is indicated
+ by a hash mark, followed by the hexadecimal representation of the
+ serial number, then followed by a slash and the RFC-2253 encoded DN
+ of the issuer. See note above.
+
+ #4F03/CN=Root Cert,O=Poets,L=Paris,C=FR
+
+ * By keygrip This is indicated by an ampersand followed by the 40 hex
+ digits of a keygrip. 'gpgsm' prints the keygrip when using the
+ command '--dump-cert'. It does not yet work for OpenPGP keys.
+
+ &D75F22C3F86E355877348498CDC92BD21010A480
+
+ * By substring match. This is the default mode but applications may
+ want to explicitly indicate this by putting the asterisk in front.
+ Match is not case sensitive.
+
+ Heine
+ *Heine
+
+ * . and + prefixes These prefixes are reserved for looking up mails
+ anchored at the end and for a word search mode. They are not yet
+ implemented and using them is undefined.
+
+ Please note that we have reused the hash mark identifier which was
+used in old GnuPG versions to indicate the so called local-id. It is
+not anymore used and there should be no conflict when used with X.509
+stuff.
+
+ Using the RFC-2253 format of DNs has the drawback that it is not
+possible to map them back to the original encoding, however we don't
+have to do this because our key database stores this encoding as meta
+data.
+
+
+File: gnupg.info, Node: Helper Tools, Next: Howtos, Prev: Specify a User ID, Up: Top
+
+8 Helper Tools
+**************
+
+GnuPG comes with a couple of smaller tools:
+
+* Menu:
+
+* watchgnupg:: Read logs from a socket.
+* gpgv:: Verify OpenPGP signatures.
+* addgnupghome:: Create .gnupg home directories.
+* gpgconf:: Modify .gnupg home directories.
+* applygnupgdefaults:: Run gpgconf for all users.
+* gpg-preset-passphrase:: Put a passphrase into the cache.
+* gpg-connect-agent:: Communicate with a running agent.
+* dirmngr-client:: How to use the Dirmngr client tool.
+* gpgparsemail:: Parse a mail message into an annotated format
+* symcryptrun:: Call a simple symmetric encryption tool.
+* gpg-zip:: Encrypt or sign files into an archive.
+
+
+File: gnupg.info, Node: watchgnupg, Next: gpgv, Up: Helper Tools
+
+8.1 Read logs from a socket
+===========================
+
+Most of the main utilities are able to write their log files to a Unix
+Domain socket if configured that way. 'watchgnupg' is a simple listener
+for such a socket. It ameliorates the output with a time stamp and
+makes sure that long lines are not interspersed with log output from
+other utilities. This tool is not available for Windows.
+
+'watchgnupg' is commonly invoked as
+
+ watchgnupg --force ~/.gnupg/S.log
+
+This starts it on the current terminal for listening on the socket
+'~/.gnupg/S.log'.
+
+'watchgnupg' understands these options:
+
+'--force'
+ Delete an already existing socket file.
+
+'--tcp N'
+ Instead of reading from a local socket, listen for connects on TCP
+ port N.
+
+'--verbose'
+ Enable extra informational output.
+
+'--version'
+ Print version of the program and exit.
+
+'--help'
+ Display a brief help page and exit.
+
+Examples
+********
+
+ $ watchgnupg --force /home/foo/.gnupg/S.log
+
+ This waits for connections on the local socket
+'/home/foo/.gnupg/S.log' and shows all log entries. To make this work
+the option 'log-file' needs to be used with all modules which logs are
+to be shown. The value for that option must be given with a special
+prefix (e.g. in the conf file):
+
+ log-file socket:///home/foo/.gnupg/S.log
+
+ For debugging purposes it is also possible to do remote logging.
+Take care if you use this feature because the information is send in the
+clear over the network. Use this syntax in the conf files:
+
+ log-file tcp://192.168.1.1:4711
+
+ You may use any port and not just 4711 as shown above; only IP
+addresses are supported (v4 and v6) and no host names. You need to
+start 'watchgnupg' with the 'tcp' option. Note that under Windows the
+registry entry HKCU\SOFTWARE\GNU\GNUPG:DEFAULTLOGFILE can be used to
+change the default log output from 'stderr' to whatever is given by that
+entry. However the only useful entry is a TCP name for remote
+debugging.
+
+
+File: gnupg.info, Node: gpgv, Next: addgnupghome, Prev: watchgnupg, Up: Helper Tools
+
+8.2 Verify OpenPGP signatures
+=============================
+
+'gpgv' is an OpenPGP signature verification tool.
+
+ This program is actually a stripped-down version of 'gpg' which is
+only able to check signatures. It is somewhat smaller than the
+fully-blown 'gpg' and uses a different (and simpler) way to check that
+the public keys used to make the signature are valid. There are no
+configuration files and only a few options are implemented.
+
+ 'gpgv' assumes that all keys in the keyring are trustworthy. That
+does also mean that it does not check for expired or revoked keys.
+
+ By default a keyring named 'trustedkeys.kbx' is used; if that does
+not exist a keyring named 'trustedkeys.gpg' is used. The default
+keyring is assumed to be in the home directory of GnuPG, either the
+default home directory or the one set by an option or an environment
+variable. The option '--keyring' may be used to specify a different
+keyring or even multiple keyrings.
+
+ 'gpgv' recognizes these options:
+
+'--verbose'
+'-v'
+ Gives more information during processing. If used twice, the input
+ data is listed in detail.
+
+'--quiet'
+'-q'
+ Try to be as quiet as possible.
+
+'--keyring FILE'
+ Add FILE to the list of keyrings. If FILE begins with a tilde and
+ a slash, these are replaced by the HOME directory. If the filename
+ does not contain a slash, it is assumed to be in the home-directory
+ ("~/.gnupg" if -homedir is not used).
+
+'--status-fd N'
+ Write special status strings to the file descriptor N. See the
+ file DETAILS in the documentation for a listing of them.
+
+'--logger-fd n'
+ Write log output to file descriptor 'n' and not to stderr.
+
+'--ignore-time-conflict'
+ GnuPG normally checks that the timestamps associated with keys and
+ signatures have plausible values. However, sometimes a signature
+ seems to be older than the key due to clock problems. This option
+ turns these checks into warnings.
+
+'--homedir DIR'
+ Set the name of the home directory to DIR. If this option is not
+ used, the home directory defaults to '~/.gnupg'. It is only
+ recognized when given on the command line. It also overrides any
+ home directory stated through the environment variable 'GNUPGHOME'
+ or (on Windows systems) by means of the Registry entry
+ HKCU\SOFTWARE\GNU\GNUPG:HOMEDIR.
+
+ On Windows systems it is possible to install GnuPG as a portable
+ application. In this case only this command line option is
+ considered, all other ways to set a home directory are ignored.
+
+ To install GnuPG as a portable application under Windows, create an
+ empty file name 'gpgconf.ctl' in the same directory as the tool
+ 'gpgconf.exe'. The root of the installation is than that
+ directory; or, if 'gpgconf.exe' has been installed directly below a
+ directory named 'bin', its parent directory. You also need to make
+ sure that the following directories exist and are writable:
+ 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ for internal cache files.
+
+'--weak-digest name'
+ Treat the specified digest algorithm as weak. Signatures made over
+ weak digests algorithms are normally rejected. This option can be
+ supplied multiple times if multiple algorithms should be considered
+ weak. MD5 is always considered weak, and does not need to be
+ listed explicitly.
+
+ The program returns 0 if everything is fine, 1 if at least one
+signature was bad, and other error codes for fatal errors.
+
+8.2.1 Examples
+--------------
+
+gpgv 'pgpfile'
+gpgv 'sigfile' ['datafile']
+ Verify the signature of the file. The second form is used for
+ detached signatures, where 'sigfile' is the detached signature
+ (either ASCII-armored or binary) and 'datafile' contains the signed
+ data; if 'datafile' is "-" the signed data is expected on 'stdin';
+ if 'datafile' is not given the name of the file holding the signed
+ data is constructed by cutting off the extension (".asc", ".sig" or
+ ".sign") from 'sigfile'.
+
+8.2.2 Environment
+-----------------
+
+HOME
+ Used to locate the default home directory.
+
+GNUPGHOME
+ If set directory used instead of "~/.gnupg".
+
+8.2.3 FILES
+-----------
+
+~/.gnupg/trustedkeys.gpg
+ The default keyring with the allowed keys.
+
+ 'gpg2'(1)
+
+
+File: gnupg.info, Node: addgnupghome, Next: gpgconf, Prev: gpgv, Up: Helper Tools
+
+8.3 Create .gnupg home directories.
+===================================
+
+If GnuPG is installed on a system with existing user accounts, it is
+sometimes required to populate the GnuPG home directory with existing
+files. Especially a 'trustlist.txt' and a keybox with some initial
+certificates are often desired. This scripts help to do this by copying
+all files from '/etc/skel/.gnupg' to the home directories of the
+accounts given on the command line. It takes care not to overwrite
+existing GnuPG home directories.
+
+'addgnupghome' is invoked by root as:
+
+ addgnupghome account1 account2 ... accountn
+
+
+File: gnupg.info, Node: gpgconf, Next: applygnupgdefaults, Prev: addgnupghome, Up: Helper Tools
+
+8.4 Modify .gnupg home directories.
+===================================
+
+The 'gpgconf' is a utility to automatically and reasonable safely query
+and modify configuration files in the '.gnupg' home directory. It is
+designed not to be invoked manually by the user, but automatically by
+graphical user interfaces (GUI).(1)
+
+ 'gpgconf' provides access to the configuration of one or more
+components of the GnuPG system. These components correspond more or
+less to the programs that exist in the GnuPG framework, like GnuPG,
+GPGSM, DirMngr, etc. But this is not a strict one-to-one relationship.
+Not all configuration options are available through 'gpgconf'.
+'gpgconf' provides a generic and abstract method to access the most
+important configuration options that can feasibly be controlled via such
+a mechanism.
+
+ 'gpgconf' can be used to gather and change the options available in
+each component, and can also provide their default values. 'gpgconf'
+will give detailed type information that can be used to restrict the
+user's input without making an attempt to commit the changes.
+
+ 'gpgconf' provides the backend of a configuration editor. The
- configuration editor would usually be a graphical user interface
- program, that allows to display the current options, their default
- values, and allows the user to make changes to the options. These
- changes can then be made active with 'gpgconf' again. Such a program
- that uses 'gpgconf' in this way will be called GUI throughout this
- section.
++configuration editor would usually be a graphical user interface program
++that displays the current options, their default values, and allows the
++user to make changes to the options. These changes can then be made
++active with 'gpgconf' again. Such a program that uses 'gpgconf' in this
++way will be called GUI throughout this section.
+
+* Menu:
+
+* Invoking gpgconf:: List of all commands and options.
+* Format conventions:: Formatting conventions relevant for all commands.
+* Listing components:: List all gpgconf components.
+* Checking programs:: Check all programs know to gpgconf.
+* Listing options:: List all options of a component.
+* Changing options:: Changing options of a component.
+* Listing global options:: List all global options.
+* Files used by gpgconf:: What files are used by gpgconf.
+
+ ---------- Footnotes ----------
+
+ (1) Please note that currently no locking is done, so concurrent
+access should be avoided. There are some precautions to avoid
+corruption with concurrent usage, but results may be inconsistent and
+some changes may get lost. The stateless design makes it difficult to
+provide more guarantees.
+
+
+File: gnupg.info, Node: Invoking gpgconf, Next: Format conventions, Up: gpgconf
+
+8.4.1 Invoking gpgconf
+----------------------
+
+One of the following commands must be given:
+
+'--list-components'
+ List all components. This is the default command used if none is
+ specified.
+
+'--check-programs'
+ List all available backend programs and test whether they are
+ runnable.
+
+'--list-options COMPONENT'
+ List all options of the component COMPONENT.
+
+'--change-options COMPONENT'
+ Change the options of the component COMPONENT.
+
+'--check-options COMPONENT'
+ Check the options for the component COMPONENT.
+
+'--apply-defaults'
+ Update all configuration files with values taken from the global
+ configuration file (usually '/etc/gnupg/gpgconf.conf').
+
+'--list-dirs [NAMES]'
+ Lists the directories used by 'gpgconf'. One directory is listed
+ per line, and each line consists of a colon-separated list where
+ the first field names the directory type (for example 'sysconfdir')
+ and the second field contains the percent-escaped directory.
+ Although they are not directories, the socket file names used by
+ 'gpg-agent' and 'dirmngr' are printed as well. Note that the
+ socket file names and the 'homedir' lines are the default names and
+ they may be overridden by command line switches. If NAMES are
+ given only the directories or file names specified by the list
+ names are printed without any escaping.
+
+'--list-config [FILENAME]'
+ List the global configuration file in a colon separated format. If
+ FILENAME is given, check that file instead.
+
+'--check-config [FILENAME]'
+ Run a syntax check on the global configuration file. If FILENAME
+ is given, check that file instead.
+
+'--reload [COMPONENT]'
+ Reload all or the given component. This is basically the same as
+ sending a SIGHUP to the component. Components which don't support
+ reloading are ignored.
+
+'--launch [COMPONENT]'
+ If the COMPONENT is not already running, start it. 'component'
+ must be a daemon. This is in general not required because the
+ system starts these daemons as needed. However, external software
+ making direct use of 'gpg-agent' or 'dirmngr' may use this command
+ to ensure that they are started.
+
+'--kill [COMPONENT]'
+ Kill the given component. Components which support killing are
+ gpg-agent and scdaemon. Components which don't support reloading
+ are ignored. Note that as of now reload and kill have the same
+ effect for scdaemon.
+
+'--create-socketdir'
+ Create a directory for sockets below /run/user or /var/run/user.
+ This is command is only required if a non default home directory is
+ used and the /run based sockets shall be used. For the default
+ home directory GnUPG creates a directory on the fly.
+
+'--remove-socketdir'
+ Remove a directory created with command '--create-socketdir'.
+
+ The following options may be used:
+
+'-o FILE'
+'--output FILE'
+ Write output to FILE. Default is to write to stdout.
+
+'-v'
+'--verbose'
+ Outputs additional information while running. Specifically, this
+ extends numerical field values by human-readable descriptions.
+
+'-q'
+'--quiet'
+ Try to be as quiet as possible.
+
+'-n'
+'--dry-run'
+ Do not actually change anything. This is currently only
+ implemented for '--change-options' and can be used for testing
+ purposes.
+
+'-r'
+'--runtime'
+ Only used together with '--change-options'. If one of the modified
+ options can be changed in a running daemon process, signal the
+ running daemon to ask it to reparse its configuration file after
+ changing.
+
+ This means that the changes will take effect at run-time, as far as
+ this is possible. Otherwise, they will take effect at the next
+ start of the respective backend programs.
+
+
+File: gnupg.info, Node: Format conventions, Next: Listing components, Prev: Invoking gpgconf, Up: gpgconf
+
+8.4.2 Format conventions
+------------------------
+
+Some lines in the output of 'gpgconf' contain a list of colon-separated
+fields. The following conventions apply:
+
+ * The GUI program is required to strip off trailing newline and/or
+ carriage return characters from the output.
+
+ * 'gpgconf' will never leave out fields. If a certain version
+ provides a certain field, this field will always be present in all
+ 'gpgconf' versions from that time on.
+
+ * Future versions of 'gpgconf' might append fields to the list. New
+ fields will always be separated from the previously last field by a
+ colon separator. The GUI should be prepared to parse the last
+ field it knows about up until a colon or end of line.
+
+ * Not all fields are defined under all conditions. You are required
+ to ignore the content of undefined fields.
+
+ There are several standard types for the content of a field:
+
+verbatim
+ Some fields contain strings that are not escaped in any way. Such
+ fields are described to be used _verbatim_. These fields will
+ never contain a colon character (for obvious reasons). No
+ de-escaping or other formatting is required to use the field
+ content. This is for easy parsing of the output, when it is known
+ that the content can never contain any special characters.
+
+percent-escaped
+ Some fields contain strings that are described to be
+ _percent-escaped_. Such strings need to be de-escaped before their
+ content can be presented to the user. A percent-escaped string is
+ de-escaped by replacing all occurrences of '%XY' by the byte that
+ has the hexadecimal value 'XY'. 'X' and 'Y' are from the set
+ '0-9a-f'.
+
+localised
+ Some fields contain strings that are described to be _localised_.
+ Such strings are translated to the active language and formatted in
+ the active character set.
+
+unsigned number
+ Some fields contain an _unsigned number_. This number will always
+ fit into a 32-bit unsigned integer variable. The number may be
+ followed by a space, followed by a human readable description of
+ that value (if the verbose option is used). You should ignore
+ everything in the field that follows the number.
+
+signed number
+ Some fields contain a _signed number_. This number will always fit
+ into a 32-bit signed integer variable. The number may be followed
+ by a space, followed by a human readable description of that value
+ (if the verbose option is used). You should ignore everything in
+ the field that follows the number.
+
+boolean value
+ Some fields contain a _boolean value_. This is a number with
+ either the value 0 or 1. The number may be followed by a space,
+ followed by a human readable description of that value (if the
+ verbose option is used). You should ignore everything in the field
+ that follows the number; checking just the first character is
+ sufficient in this case.
+
+option
+ Some fields contain an _option_ argument. The format of an option
+ argument depends on the type of the option and on some flags:
+
+ no argument
+ The simplest case is that the option does not take an argument
+ at all (TYPE '0'). Then the option argument is an unsigned
+ number that specifies how often the option occurs. If the
+ 'list' flag is not set, then the only valid number is '1'.
+ Options that do not take an argument never have the 'default'
+ or 'optional arg' flag set.
+
+ number
+ If the option takes a number argument (ALT-TYPE is '2' or
+ '3'), and it can only occur once ('list' flag is not set),
+ then the option argument is either empty (only allowed if the
+ argument is optional), or it is a number. A number is a
+ string that begins with an optional minus character, followed
+ by one or more digits. The number must fit into an integer
+ variable (unsigned or signed, depending on ALT-TYPE).
+
+ number list
+ If the option takes a number argument and it can occur more
+ than once, then the option argument is either empty, or it is
+ a comma-separated list of numbers as described above.
+
+ string
+ If the option takes a string argument (ALT-TYPE is 1), and it
+ can only occur once ('list' flag is not set) then the option
+ argument is either empty (only allowed if the argument is
+ optional), or it starts with a double quote character ('"')
+ followed by a percent-escaped string that is the argument
+ value. Note that there is only a leading double quote
+ character, no trailing one. The double quote character is
+ only needed to be able to differentiate between no value and
+ the empty string as value.
+
+ string list
+ If the option takes a number argument and it can occur more
+ than once, then the option argument is either empty, or it is
+ a comma-separated list of string arguments as described above.
+
+ The active language and character set are currently determined from
+the locale environment of the 'gpgconf' program.
+
+
+File: gnupg.info, Node: Listing components, Next: Checking programs, Prev: Format conventions, Up: gpgconf
+
+8.4.3 Listing components
+------------------------
+
+The command '--list-components' will list all components that can be
+configured with 'gpgconf'. Usually, one component will correspond to
+one GnuPG-related program and contain the options of that programs
+configuration file that can be modified using 'gpgconf'. However, this
+is not necessarily the case. A component might also be a group of
+selected options from several programs, or contain entirely virtual
+options that have a special effect rather than changing exactly one
+option in one configuration file.
+
+ A component is a set of configuration options that semantically
+belong together. Furthermore, several changes to a component can be
+made in an atomic way with a single operation. The GUI could for
+example provide a menu with one entry for each component, or a window
+with one tabulator sheet per component.
+
+ The command argument '--list-components' lists all available
+components, one per line. The format of each line is:
+
+ 'NAME:DESCRIPTION:PGMNAME:'
+
+NAME
+ This field contains a name tag of the component. The name tag is
+ used to specify the component in all communication with 'gpgconf'.
+ The name tag is to be used _verbatim_. It is thus not in any
+ escaped format.
+
+DESCRIPTION
+ The _string_ in this field contains a human-readable description of
+ the component. It can be displayed to the user of the GUI for
+ informational purposes. It is _percent-escaped_ and _localized_.
+
+PGMNAME
+ The _string_ in this field contains the absolute name of the
+ program's file. It can be used to unambiguously invoke that
+ program. It is _percent-escaped_.
+
+ Example:
+ $ gpgconf --list-components
+ gpg:GPG for OpenPGP:/usr/local/bin/gpg2:
+ gpg-agent:GPG Agent:/usr/local/bin/gpg-agent:
+ scdaemon:Smartcard Daemon:/usr/local/bin/scdaemon:
+ gpgsm:GPG for S/MIME:/usr/local/bin/gpgsm:
+ dirmngr:Directory Manager:/usr/local/bin/dirmngr:
+
+
+File: gnupg.info, Node: Checking programs, Next: Listing options, Prev: Listing components, Up: gpgconf
+
+8.4.4 Checking programs
+-----------------------
+
+The command '--check-programs' is similar to '--list-components' but
+works on backend programs and not on components. It runs each program
+to test whether it is installed and runnable. This also includes a
+syntax check of all config file options of the program.
+
+ The command argument '--check-programs' lists all available programs,
+one per line. The format of each line is:
+
+ 'NAME:DESCRIPTION:PGMNAME:AVAIL:OKAY:CFGFILE:LINE:ERROR:'
+
+NAME
+ This field contains a name tag of the program which is identical to
+ the name of the component. The name tag is to be used _verbatim_.
+ It is thus not in any escaped format. This field may be empty to
+ indicate a continuation of error descriptions for the last name.
+ The description and pgmname fields are then also empty.
+
+DESCRIPTION
+ The _string_ in this field contains a human-readable description of
+ the component. It can be displayed to the user of the GUI for
+ informational purposes. It is _percent-escaped_ and _localized_.
+
+PGMNAME
+ The _string_ in this field contains the absolute name of the
+ program's file. It can be used to unambiguously invoke that
+ program. It is _percent-escaped_.
+
+AVAIL
+ The _boolean value_ in this field indicates whether the program is
+ installed and runnable.
+
+OKAY
+ The _boolean value_ in this field indicates whether the program's
+ config file is syntactically okay.
+
+CFGFILE
+ If an error occurred in the configuration file (as indicated by a
+ false value in the field 'okay'), this field has the name of the
+ failing configuration file. It is _percent-escaped_.
+
+LINE
+ If an error occurred in the configuration file, this field has the
+ line number of the failing statement in the configuration file. It
+ is an _unsigned number_.
+
+ERROR
+ If an error occurred in the configuration file, this field has the
+ error text of the failing statement in the configuration file. It
+ is _percent-escaped_ and _localized_.
+
+In the following example the 'dirmngr' is not runnable and the
+configuration file of 'scdaemon' is not okay.
+
+ $ gpgconf --check-programs
+ gpg:GPG for OpenPGP:/usr/local/bin/gpg2:1:1:
+ gpg-agent:GPG Agent:/usr/local/bin/gpg-agent:1:1:
+ scdaemon:Smartcard Daemon:/usr/local/bin/scdaemon:1:0:
+ gpgsm:GPG for S/MIME:/usr/local/bin/gpgsm:1:1:
+ dirmngr:Directory Manager:/usr/local/bin/dirmngr:0:0:
+
+The command '--check-options COMPONENT' will verify the configuration
+file in the same manner as '--check-programs', but only for the
+component COMPONENT.
+
+
+File: gnupg.info, Node: Listing options, Next: Changing options, Prev: Checking programs, Up: gpgconf
+
+8.4.5 Listing options
+---------------------
+
+Every component contains one or more options. Options may be gathered
+into option groups to allow the GUI to give visual hints to the user
+about which options are related.
+
+ The command argument '--list-options COMPONENT' lists all options
+(and the groups they belong to) in the component COMPONENT, one per
+line. COMPONENT must be the string in the field NAME in the output of
+the '--list-components' command.
+
+ There is one line for each option and each group. First come all
+options that are not in any group. Then comes a line describing a
+group. Then come all options that belong into each group. Then comes
+the next group and so on. There does not need to be any group (and in
+this case the output will stop after the last non-grouped option).
+
+ The format of each line is:
+
+ 'NAME:FLAGS:LEVEL:DESCRIPTION:TYPE:ALT-TYPE:ARGNAME:DEFAULT:ARGDEF:VALUE'
+
+NAME
+ This field contains a name tag for the group or option. The name
+ tag is used to specify the group or option in all communication
+ with 'gpgconf'. The name tag is to be used _verbatim_. It is thus
+ not in any escaped format.
+
+FLAGS
+ The flags field contains an _unsigned number_. Its value is the
+ OR-wise combination of the following flag values:
+
+ 'group (1)'
+ If this flag is set, this is a line describing a group and not
+ an option.
+
+ The following flag values are only defined for options (that is, if
+ the 'group' flag is not used).
+
+ 'optional arg (2)'
+ If this flag is set, the argument is optional. This is never
+ set for TYPE '0' (none) options.
+
+ 'list (4)'
+ If this flag is set, the option can be given multiple times.
+
+ 'runtime (8)'
+ If this flag is set, the option can be changed at runtime.
+
+ 'default (16)'
+ If this flag is set, a default value is available.
+
+ 'default desc (32)'
+ If this flag is set, a (runtime) default is available. This
+ and the 'default' flag are mutually exclusive.
+
+ 'no arg desc (64)'
+ If this flag is set, and the 'optional arg' flag is set, then
+ the option has a special meaning if no argument is given.
+
+ 'no change (128)'
+ If this flag is set, gpgconf ignores requests to change the
+ value. GUI frontends should grey out this option. Note, that
+ manual changes of the configuration files are still possible.
+
+LEVEL
+ This field is defined for options and for groups. It contains an
+ _unsigned number_ that specifies the expert level under which this
+ group or option should be displayed. The following expert levels
+ are defined for options (they have analogous meaning for groups):
+
+ 'basic (0)'
+ This option should always be offered to the user.
+
+ 'advanced (1)'
+ This option may be offered to advanced users.
+
+ 'expert (2)'
+ This option should only be offered to expert users.
+
+ 'invisible (3)'
+ This option should normally never be displayed, not even to
+ expert users.
+
+ 'internal (4)'
+ This option is for internal use only. Ignore it.
+
+ The level of a group will always be the lowest level of all options
+ it contains.
+
+DESCRIPTION
+ This field is defined for options and groups. The _string_ in this
+ field contains a human-readable description of the option or group.
+ It can be displayed to the user of the GUI for informational
+ purposes. It is _percent-escaped_ and _localized_.
+
+TYPE
+ This field is only defined for options. It contains an _unsigned
+ number_ that specifies the type of the option's argument, if any.
+ The following types are defined:
+
+ Basic types:
+
+ 'none (0)'
+ No argument allowed.
+
+ 'string (1)'
+ An _unformatted string_.
+
+ 'int32 (2)'
+ A _signed number_.
+
+ 'uint32 (3)'
+ An _unsigned number_.
+
+ Complex types:
+
+ 'pathname (32)'
+ A _string_ that describes the pathname of a file. The file
+ does not necessarily need to exist.
+
+ 'ldap server (33)'
+ A _string_ that describes an LDAP server in the format:
+
+ 'HOSTNAME:PORT:USERNAME:PASSWORD:BASE_DN'
+
+ 'key fingerprint (34)'
+ A _string_ with a 40 digit fingerprint specifying a
+ certificate.
+
+ 'pub key (35)'
+ A _string_ that describes a certificate by user ID, key ID or
+ fingerprint.
+
+ 'sec key (36)'
+ A _string_ that describes a certificate with a key by user ID,
+ key ID or fingerprint.
+
+ 'alias list (37)'
+ A _string_ that describes an alias list, like the one used
+ with gpg's group option. The list consists of a key, an equal
+ sign and space separated values.
+
+ More types will be added in the future. Please see the ALT-TYPE
+ field for information on how to cope with unknown types.
+
+ALT-TYPE
+ This field is identical to TYPE, except that only the types '0' to
+ '31' are allowed. The GUI is expected to present the user the
+ option in the format specified by TYPE. But if the argument type
+ TYPE is not supported by the GUI, it can still display the option
+ in the more generic basic type ALT-TYPE. The GUI must support all
+ the defined basic types to be able to display all options. More
+ basic types may be added in future versions. If the GUI encounters
+ a basic type it doesn't support, it should report an error and
+ abort the operation.
+
+ARGNAME
+ This field is only defined for options with an argument type TYPE
+ that is not '0'. In this case it may contain a _percent-escaped_
+ and _localised string_ that gives a short name for the argument.
+ The field may also be empty, though, in which case a short name is
+ not known.
+
+DEFAULT
+ This field is defined only for options for which the 'default' or
+ 'default desc' flag is set. If the 'default' flag is set, its
+ format is that of an _option argument_ (*Note Format conventions::,
+ for details). If the default value is empty, then no default is
+ known. Otherwise, the value specifies the default value for this
+ option. If the 'default desc' flag is set, the field is either
+ empty or contains a description of the effect if the option is not
+ given.
+
+ARGDEF
+ This field is defined only for options for which the 'optional arg'
+ flag is set. If the 'no arg desc' flag is not set, its format is
+ that of an _option argument_ (*Note Format conventions::, for
+ details). If the default value is empty, then no default is known.
+ Otherwise, the value specifies the default argument for this
+ option. If the 'no arg desc' flag is set, the field is either
+ empty or contains a description of the effect of this option if no
+ argument is given.
+
+VALUE
+ This field is defined only for options. Its format is that of an
+ _option argument_. If it is empty, then the option is not
+ explicitly set in the current configuration, and the default
+ applies (if any). Otherwise, it contains the current value of the
+ option. Note that this field is also meaningful if the option
+ itself does not take a real argument (in this case, it contains the
+ number of times the option appears).
+
+
+File: gnupg.info, Node: Changing options, Next: Listing global options, Prev: Listing options, Up: gpgconf
+
+8.4.6 Changing options
+----------------------
+
+The command '--change-options COMPONENT' will attempt to change the
+options of the component COMPONENT to the specified values. COMPONENT
+must be the string in the field NAME in the output of the
+'--list-components' command. You have to provide the options that shall
+be changed in the following format on standard input:
+
+ 'NAME:FLAGS:NEW-VALUE'
+
+NAME
+ This is the name of the option to change. NAME must be the string
+ in the field NAME in the output of the '--list-options' command.
+
+FLAGS
+ The flags field contains an _unsigned number_. Its value is the
+ OR-wise combination of the following flag values:
+
+ 'default (16)'
+ If this flag is set, the option is deleted and the default
+ value is used instead (if applicable).
+
+NEW-VALUE
+ The new value for the option. This field is only defined if the
+ 'default' flag is not set. The format is that of an _option
+ argument_. If it is empty (or the field is omitted), the default
+ argument is used (only allowed if the argument is optional for this
+ option). Otherwise, the option will be set to the specified value.
+
+The output of the command is the same as that of '--check-options' for
+the modified configuration file.
+
+ Examples:
+
+ To set the force option, which is of basic type 'none (0)':
+
+ $ echo 'force:0:1' | gpgconf --change-options dirmngr
+
+ To delete the force option:
+
+ $ echo 'force:16:' | gpgconf --change-options dirmngr
+
+ The '--runtime' option can influence when the changes take effect.
+
+
+File: gnupg.info, Node: Listing global options, Next: Files used by gpgconf, Prev: Changing options, Up: gpgconf
+
+8.4.7 Listing global options
+----------------------------
+
+Sometimes it is useful for applications to look at the global options
+file 'gpgconf.conf'. The colon separated listing format is record
+oriented and uses the first field to identify the record type:
+
+'k'
+ This describes a key record to start the definition of a new
+ ruleset for a user/group. The format of a key record is:
+
+ 'k:USER:GROUP:'
+
+ USER
+ This is the user field of the key. It is percent escaped.
+ See the definition of the gpgconf.conf format for details.
+
+ GROUP
+ This is the group field of the key. It is percent escaped.
+
+'r'
+ This describes a rule record. All rule records up to the next key
+ record make up a rule set for that key. The format of a rule
+ record is:
+
+ 'r:::COMPONENT:OPTION:FLAGS:VALUE:'
+
+ COMPONENT
+ This is the component part of a rule. It is a plain string.
+
+ OPTION
+ This is the option part of a rule. It is a plain string.
+
+ FLAG
+ This is the flags part of a rule. There may be only one flag
+ per rule but by using the same component and option, several
+ flags may be assigned to an option. It is a plain string.
+
+ VALUE
+ This is the optional value for the option. It is a percent
+ escaped string with a single quotation mark to indicate a
+ string. The quotation mark is only required to distinguish
+ between no value specified and an empty string.
+
+Unknown record types should be ignored. Note that there is
+intentionally no feature to change the global option file through
+'gpgconf'.
+
+
+File: gnupg.info, Node: Files used by gpgconf, Prev: Listing global options, Up: gpgconf
+
+8.4.8 Files used by gpgconf
+---------------------------
+
+'/etc/gnupg/gpgconf.conf'
+ If this file exists, it is processed as a global configuration
+ file. A commented example can be found in the 'examples' directory
+ of the distribution.
+
+
+File: gnupg.info, Node: applygnupgdefaults, Next: gpg-preset-passphrase, Prev: gpgconf, Up: Helper Tools
+
+8.5 Run gpgconf for all users.
+==============================
+
+This script is a wrapper around 'gpgconf' to run it with the command
+'--apply-defaults' for all real users with an existing GnuPG home
+directory. Admins might want to use this script to update he GnuPG
+configuration files for all users after '/etc/gnupg/gpgconf.conf' has
- been changed. This allows to enforce certain policies for all users.
- Note, that this is not a bulletproof of forcing a user to use certain
++been changed. This allows enforcing certain policies for all users.
++Note, that this is not a bulletproof way to force a user to use certain
+options. A user may always directly edit the configuration files and
+bypass gpgconf.
+
+'applygnupgdefaults' is invoked by root as:
+
+ applygnupgdefaults
+
+
+File: gnupg.info, Node: gpg-preset-passphrase, Next: gpg-connect-agent, Prev: applygnupgdefaults, Up: Helper Tools
+
+8.6 Put a passphrase into the cache.
+====================================
+
+The 'gpg-preset-passphrase' is a utility to seed the internal cache of a
+running 'gpg-agent' with passphrases. It is mainly useful for
+unattended machines, where the usual 'pinentry' tool may not be used and
+the passphrases for the to be used keys are given at machine startup.
+
+ Passphrases set with this utility don't expire unless the '--forget'
+option is used to explicitly clear them from the cache -- or 'gpg-agent'
+is either restarted or reloaded (by sending a SIGHUP to it). Note that
+the maximum cache time as set with '--max-cache-ttl' is still honored.
+It is necessary to allow this passphrase presetting by starting
+'gpg-agent' with the '--allow-preset-passphrase'.
+
+* Menu:
+
+* Invoking gpg-preset-passphrase:: List of all commands and options.
+
+
+File: gnupg.info, Node: Invoking gpg-preset-passphrase, Up: gpg-preset-passphrase
+
+8.6.1 List of all commands and options.
+---------------------------------------
+
+'gpg-preset-passphrase' is invoked this way:
+
+ gpg-preset-passphrase [options] [command] CACHEID
+
+ CACHEID is either a 40 character keygrip of hexadecimal characters
+identifying the key for which the passphrase should be set or cleared.
+The keygrip is listed along with the key when running the command:
+'gpgsm --dump-secret-keys'. Alternatively an arbitrary string may be
+used to identify a passphrase; it is suggested that such a string is
+prefixed with the name of the application (e.g 'foo:12346').
+
+One of the following command options must be given:
+
+'--preset'
+ Preset a passphrase. This is what you usually will use.
+ 'gpg-preset-passphrase' will then read the passphrase from 'stdin'.
+
+'--forget'
+ Flush the passphrase for the given cache ID from the cache.
+
+The following additional options may be used:
+
+'-v'
+'--verbose'
+ Output additional information while running.
+
+'-P STRING'
+'--passphrase STRING'
+ Instead of reading the passphrase from 'stdin', use the supplied
+ STRING as passphrase. Note that this makes the passphrase visible
+ for other users.
+
+
+File: gnupg.info, Node: gpg-connect-agent, Next: dirmngr-client, Prev: gpg-preset-passphrase, Up: Helper Tools
+
+8.7 Communicate with a running agent.
+=====================================
+
+The 'gpg-connect-agent' is a utility to communicate with a running
+'gpg-agent'. It is useful to check out the commands gpg-agent provides
+using the Assuan interface. It might also be useful for scripting
+simple applications. Input is expected at stdin and out put gets
+printed to stdout.
+
+ It is very similar to running 'gpg-agent' in server mode; but here we
+connect to a running instance.
+
+* Menu:
+
+* Invoking gpg-connect-agent:: List of all options.
+* Controlling gpg-connect-agent:: Control commands.
+
+
+File: gnupg.info, Node: Invoking gpg-connect-agent, Next: Controlling gpg-connect-agent, Up: gpg-connect-agent
+
+8.7.1 List of all options.
+--------------------------
+
+'gpg-connect-agent' is invoked this way:
+
+ gpg-connect-agent [options] [commands]
+
+The following options may be used:
+
+'-v'
+'--verbose'
+ Output additional information while running.
+
+'-q'
+'--quiet'
+ Try to be as quiet as possible.
+
+'--homedir DIR'
+ Set the name of the home directory to DIR. If this option is not
+ used, the home directory defaults to '~/.gnupg'. It is only
+ recognized when given on the command line. It also overrides any
+ home directory stated through the environment variable 'GNUPGHOME'
+ or (on Windows systems) by means of the Registry entry
+ HKCU\SOFTWARE\GNU\GNUPG:HOMEDIR.
+
+ On Windows systems it is possible to install GnuPG as a portable
+ application. In this case only this command line option is
+ considered, all other ways to set a home directory are ignored.
+
+ To install GnuPG as a portable application under Windows, create an
+ empty file name 'gpgconf.ctl' in the same directory as the tool
+ 'gpgconf.exe'. The root of the installation is than that
+ directory; or, if 'gpgconf.exe' has been installed directly below a
+ directory named 'bin', its parent directory. You also need to make
+ sure that the following directories exist and are writable:
+ 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ for internal cache files.
+
+'--agent-program FILE'
+ Specify the agent program to be started if none is running. The
+ default value is determined by running 'gpgconf' with the option
+ '--list-dirs'. Note that the pipe symbol ('|') is used for a
+ regression test suite hack and may thus not be used in the file
+ name.
+
+'--dirmngr-program FILE'
+ Specify the directory manager (keyserver client) program to be
+ started if none is running. This has only an effect if used
+ together with the option '--dirmngr'.
+
+'--dirmngr'
+ Connect to a running directory manager (keyserver client) instead
+ of to the gpg-agent. If a dirmngr is not running, start it.
+
+'-S'
+'--raw-socket NAME'
+ Connect to socket NAME assuming this is an Assuan style server. Do
+ not run any special initializations or environment checks. This
+ may be used to directly connect to any Assuan style socket server.
+
+'-E'
+'--exec'
+ Take the rest of the command line as a program and it's arguments
+ and execute it as an assuan server. Here is how you would run
+ 'gpgsm':
+ gpg-connect-agent --exec gpgsm --server
+ Note that you may not use options on the command line in this case.
+
+'--no-ext-connect'
+ When using '-S' or '--exec', 'gpg-connect-agent' connects to the
+ assuan server in extended mode to allow descriptor passing. This
+ option makes it use the old mode.
+
+'--no-autostart'
+ Do not start the gpg-agent or the dirmngr if it has not yet been
+ started.
+
+'-r FILE'
+'--run FILE'
+ Run the commands from FILE at startup and then continue with the
+ regular input method. Note, that commands given on the command
+ line are executed after this file.
+
+'-s'
+'--subst'
+ Run the command '/subst' at startup.
+
+'--hex'
+ Print data lines in a hex format and the ASCII representation of
+ non-control characters.
+
+'--decode'
+ Decode data lines. That is to remove percent escapes but make sure
+ that a new line always starts with a D and a space.
+
+
+File: gnupg.info, Node: Controlling gpg-connect-agent, Prev: Invoking gpg-connect-agent, Up: gpg-connect-agent
+
+8.7.2 Control commands.
+-----------------------
+
+While reading Assuan commands, gpg-agent also allows a few special
+commands to control its operation. These control commands all start
+with a slash ('/').
+
+'/echo ARGS'
+ Just print ARGS.
+
+'/let NAME VALUE'
+ Set the variable NAME to VALUE. Variables are only substituted on
+ the input if the '/subst' has been used. Variables are referenced
+ by prefixing the name with a dollar sign and optionally include the
+ name in curly braces. The rules for a valid name are identically
+ to those of the standard bourne shell. This is not yet enforced
+ but may be in the future. When used with curly braces no leading
+ or trailing white space is allowed.
+
+ If a variable is not found, it is searched in the environment and
+ if found copied to the table of variables.
+
+ Variable functions are available: The name of the function must be
+ followed by at least one space and the at least one argument. The
+ following functions are available:
+
+ 'get'
+ Return a value described by the argument. Available arguments
+ are:
+
+ 'cwd'
+ The current working directory.
+ 'homedir'
+ The gnupg homedir.
+ 'sysconfdir'
+ GnuPG's system configuration directory.
+ 'bindir'
+ GnuPG's binary directory.
+ 'libdir'
+ GnuPG's library directory.
+ 'libexecdir'
+ GnuPG's library directory for executable files.
+ 'datadir'
+ GnuPG's data directory.
+ 'serverpid'
+ The PID of the current server. Command '/serverpid' must
+ have been given to return a useful value.
+
+ 'unescape ARGS'
+ Remove C-style escapes from ARGS. Note that '\0' and '\x00'
+ terminate the returned string implicitly. The string to be
+ converted are the entire arguments right behind the delimiting
+ space of the function name.
+
+ 'unpercent ARGS'
+ 'unpercent+ ARGS'
+ Remove percent style escaping from ARGS. Note that '%00'
+ terminates the string implicitly. The string to be converted
+ are the entire arguments right behind the delimiting space of
+ the function name. 'unpercent+' also maps plus signs to a
+ spaces.
+
+ 'percent ARGS'
+ 'percent+ ARGS'
+ Escape the ARGS using percent style escaping. Tabs,
+ formfeeds, linefeeds, carriage returns and colons are escaped.
+ 'percent+' also maps spaces to plus signs.
+
+ 'errcode ARG'
+ 'errsource ARG'
+ 'errstring ARG'
+ Assume ARG is an integer and evaluate it using 'strtol'.
+ Return the gpg-error error code, error source or a formatted
+ string with the error code and error source.
+
+ '+'
+ '-'
+ '*'
+ '/'
+ '%'
+ Evaluate all arguments as long integers using 'strtol' and
+ apply this operator. A division by zero yields an empty
+ string.
+
+ '!'
+ '|'
+ '&'
+ Evaluate all arguments as long integers using 'strtol' and
+ apply the logical operators NOT, OR or AND. The NOT operator
+ works on the last argument only.
+
+'/definq NAME VAR'
+ Use content of the variable VAR for inquiries with NAME. NAME may
+ be an asterisk ('*') to match any inquiry.
+
+'/definqfile NAME FILE'
+ Use content of FILE for inquiries with NAME. NAME may be an
+ asterisk ('*') to match any inquiry.
+
+'/definqprog NAME PROG'
+ Run PROG for inquiries matching NAME and pass the entire line to it
+ as command line arguments.
+
+'/datafile NAME'
+ Write all data lines from the server to the file NAME. The file is
+ opened for writing and created if it does not exists. An existing
+ file is first truncated to 0. The data written to the file fully
+ decoded. Using a single dash for NAME writes to stdout. The file
+ is kept open until a new file is set using this command or this
+ command is used without an argument.
+
+'/showdef'
+ Print all definitions
+
+'/cleardef'
+ Delete all definitions
+
+'/sendfd FILE MODE'
+ Open FILE in MODE (which needs to be a valid 'fopen' mode string)
+ and send the file descriptor to the server. This is usually
+ followed by a command like 'INPUT FD' to set the input source for
+ other commands.
+
+'/recvfd'
+ Not yet implemented.
+
+'/open VAR FILE [MODE]'
+ Open FILE and assign the file descriptor to VAR. Warning: This
+ command is experimental and might change in future versions.
+
+'/close FD'
+ Close the file descriptor FD. Warning: This command is
+ experimental and might change in future versions.
+
+'/showopen'
+ Show a list of open files.
+
+'/serverpid'
+ Send the Assuan command 'GETINFO pid' to the server and store the
+ returned PID for internal purposes.
+
+'/sleep'
+ Sleep for a second.
+
+'/hex'
+'/nohex'
+ Same as the command line option '--hex'.
+
+'/decode'
+'/nodecode'
+ Same as the command line option '--decode'.
+
+'/subst'
+'/nosubst'
+ Enable and disable variable substitution. It defaults to disabled
+ unless the command line option '--subst' has been used. If /subst
+ as been enabled once, leading whitespace is removed from input
+ lines which makes scripts easier to read.
+
+'/while CONDITION'
+'/end'
+ These commands provide a way for executing loops. All lines
+ between the 'while' and the corresponding 'end' are executed as
+ long as the evaluation of CONDITION yields a non-zero value or is
+ the string 'true' or 'yes'. The evaluation is done by passing
+ CONDITION to the 'strtol' function. Example:
+
+ /subst
+ /let i 3
+ /while $i
+ /echo loop couter is $i
+ /let i ${- $i 1}
+ /end
+
+'/if CONDITION'
+'/end'
+ These commands provide a way for conditional execution. All lines
+ between the 'if' and the corresponding 'end' are executed only if
+ the evaluation of CONDITION yields a non-zero value or is the
+ string 'true' or 'yes'. The evaluation is done by passing
+ CONDITION to the 'strtol' function.
+
+'/run FILE'
+ Run commands from FILE.
+
+'/bye'
+ Terminate the connection and the program
+
+'/help'
+ Print a list of available control commands.
+
+
+File: gnupg.info, Node: dirmngr-client, Next: gpgparsemail, Prev: gpg-connect-agent, Up: Helper Tools
+
+8.8 The Dirmngr Client Tool
+===========================
+
+The 'dirmngr-client' is a simple tool to contact a running dirmngr and
+test whether a certificate has been revoked -- either by being listed in
+the corresponding CRL or by running the OCSP protocol. If no dirmngr is
+running, a new instances will be started but this is in general not a
+good idea due to the huge performance overhead.
+
+The usual way to run this tool is either:
+
+ dirmngr-client ACERT
+
+or
+
+ dirmngr-client <ACERT
+
+ Where ACERT is one DER encoded (binary) X.509 certificates to be
+tested. The return value of this command is
+
+'0'
+ The certificate under question is valid; i.e. there is a valid CRL
+ available and it is not listed there or the OCSP request returned
+ that that certificate is valid.
+
+'1'
+ The certificate has been revoked
+
+'2 (and other values)'
+ There was a problem checking the revocation state of the
+ certificate. A message to stderr has given more detailed
+ information. Most likely this is due to a missing or expired CRL
+ or due to a network problem.
+
+'dirmngr-client' may be called with the following options:
+
+'--version'
+ Print the program version and licensing information. Note that you
+ cannot abbreviate this command.
+
+'--help, -h'
+ Print a usage message summarizing the most useful command-line
+ options. Note that you cannot abbreviate this command.
+
+'--quiet, -q'
+ Make the output extra brief by suppressing any informational
+ messages.
+
+'-v'
+'--verbose'
+ Outputs additional information while running. You can increase the
+ verbosity by giving several verbose commands to DIRMNGR, such as
+ '-vv'.
+
+'--pem'
+ Assume that the given certificate is in PEM (armored) format.
+
+'--ocsp'
+ Do the check using the OCSP protocol and ignore any CRLs.
+
+'--force-default-responder'
+ When checking using the OCSP protocl, force the use of the default
+ OCSP responder. That is not to use the Reponder as given by the
+ certificate.
+
+'--ping'
+ Check whether the dirmngr daemon is up and running.
+
+'--cache-cert'
+ Put the given certificate into the cache of a running dirmngr.
+ This is mainly useful for debugging.
+
+'--validate'
+ Validate the given certificate using dirmngr's internal validation
+ code. This is mainly useful for debugging.
+
+'--load-crl'
+ This command expects a list of filenames with DER encoded CRL
+ files. With the option '--url' URLs are expected in place of
+ filenames and they are loaded directly from the given location.
+ All CRLs will be validated and then loaded into dirmngr's cache.
+
+'--lookup'
+ Take the remaining arguments and run a lookup command on each of
+ them. The results are Base-64 encoded outputs (without header
+ lines). This may be used to retrieve certificates from a server.
+ However the output format is not very well suited if more than one
+ certificate is returned.
+
+'--url'
+'-u'
+ Modify the 'lookup' and 'load-crl' commands to take an URL.
+
+'--local'
+'-l'
+ Let the 'lookup' command only search the local cache.
+
+'--squid-mode'
+ Run DIRMNGR-CLIENT in a mode suitable as a helper program for
+ Squid's 'external_acl_type' option.
+
+
+File: gnupg.info, Node: gpgparsemail, Next: symcryptrun, Prev: dirmngr-client, Up: Helper Tools
+
+8.9 Parse a mail message into an annotated format
+=================================================
+
+The 'gpgparsemail' is a utility currently only useful for debugging.
+Run it with '--help' for usage information.
+
+
+File: gnupg.info, Node: symcryptrun, Next: gpg-zip, Prev: gpgparsemail, Up: Helper Tools
+
+8.10 Call a simple symmetric encryption tool.
+=============================================
+
+Sometimes simple encryption tools are already in use for a long time and
+there might be a desire to integrate them into the GnuPG framework. The
+protocols and encryption methods might be non-standard or not even
+properly documented, so that a full-fledged encryption tool with an
+interface like gpg is not doable. 'symcryptrun' provides a solution: It
+operates by calling the external encryption/decryption module and
+provides a passphrase for a key using the standard 'pinentry' based
+mechanism through 'gpg-agent'.
+
+ Note, that 'symcryptrun' is only available if GnuPG has been
+configured with '--enable-symcryptrun' at build time.
+
+* Menu:
+
+* Invoking symcryptrun:: List of all commands and options.
+
+
+File: gnupg.info, Node: Invoking symcryptrun, Up: symcryptrun
+
+8.10.1 List of all commands and options.
+----------------------------------------
+
+'symcryptrun' is invoked this way:
+
+ symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE
+ [--decrypt | --encrypt] [inputfile]
+
+ For encryption, the plain text must be provided on STDIN or as the
+argument INPUTFILE, and the ciphertext will be output to STDOUT. For
+decryption vice versa.
+
+ CLASS describes the calling conventions of the external tool.
+Currently it must be given as 'confucius'. PROGRAM is the full filename
+of that external tool.
+
+ For the class 'confucius' the option '--keyfile' is required; KEYFILE
+is the name of a file containing the secret key, which may be protected
+by a passphrase. For detailed calling conventions, see the source code.
+
+Note, that 'gpg-agent' must be running before starting 'symcryptrun'.
+
+The following additional options may be used:
+
+'-v'
+'--verbose'
+ Output additional information while running.
+
+'-q'
+'--quiet'
+ Try to be as quiet as possible.
+
+'--homedir DIR'
+ Set the name of the home directory to DIR. If this option is not
+ used, the home directory defaults to '~/.gnupg'. It is only
+ recognized when given on the command line. It also overrides any
+ home directory stated through the environment variable 'GNUPGHOME'
+ or (on Windows systems) by means of the Registry entry
+ HKCU\SOFTWARE\GNU\GNUPG:HOMEDIR.
+
+ On Windows systems it is possible to install GnuPG as a portable
+ application. In this case only this command line option is
+ considered, all other ways to set a home directory are ignored.
+
+ To install GnuPG as a portable application under Windows, create an
+ empty file name 'gpgconf.ctl' in the same directory as the tool
+ 'gpgconf.exe'. The root of the installation is than that
+ directory; or, if 'gpgconf.exe' has been installed directly below a
+ directory named 'bin', its parent directory. You also need to make
+ sure that the following directories exist and are writable:
+ 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ for internal cache files.
+
+'--log-file FILE'
+ Append all logging output to FILE. Default is to write logging
+ information to STDERR.
+
+The possible exit status codes of 'symcryptrun' are:
+
+'0'
+ Success.
+'1'
- Some error occured.
++ Some error occurred.
+'2'
+ No valid passphrase was provided.
+'3'
+ The operation was canceled by the user.
+
+
+File: gnupg.info, Node: gpg-zip, Prev: symcryptrun, Up: Helper Tools
+
+8.11 Encrypt or sign files into an archive
+==========================================
+
+'gpg-zip' encrypts or signs files into an archive. It is an gpg-ized
+tar using the same format as used by PGP's PGP Zip.
+
+'gpg-zip' is invoked this way:
+
+ gpg-zip [options] FILENAME1 [FILENAME2, ...] DIRECTORY [DIRECTORY2, ...]
+
+'gpg-zip' understands these options:
+
+'--encrypt'
+'-e'
+ Encrypt data. This option may be combined with '--symmetric' (for
+ output that may be decrypted via a secret key or a passphrase).
+
+'--decrypt'
+'-d'
+ Decrypt data.
+
+'--symmetric'
+'-c'
+ Encrypt with a symmetric cipher using a passphrase. The default
+ symmetric cipher used is CAST5, but may be chosen with the
+ '--cipher-algo' option to 'gpg'.
+
+'--sign'
+'-s'
+ Make a signature. See 'gpg'.
+
+'--recipient USER'
+'-r USER'
+ Encrypt for user id USER. See 'gpg'.
+
+'--local-user USER'
+'-u USER'
+ Use USER as the key to sign with. See 'gpg'.
+
+'--list-archive'
+ List the contents of the specified archive.
+
+'--output FILE'
+'-o FILE'
+ Write output to specified file FILE.
+
+'--gpg GPGCMD'
+ Use the specified command GPGCMD instead of 'gpg'.
+
+'--gpg-args ARGS'
+ Pass the specified options to 'gpg'.
+
+'--tar TARCMD'
+ Use the specified command TARCMD instead of 'tar'.
+
+'--tar-args ARGS'
+ Pass the specified options to 'tar'.
+
+'--version'
+ Print version of the program and exit.
+
+'--help'
+ Display a brief help page and exit.
+
+The program returns 0 if everything was fine, 1 otherwise.
+
+Some examples:
+
+Encrypt the contents of directory 'mydocs' for user Bob to file 'test1':
+
+ gpg-zip --encrypt --output test1 --gpg-args -r Bob mydocs
+
+List the contents of archive 'test1':
+
+ gpg-zip --list-archive test1
+
+
+File: gnupg.info, Node: Howtos, Next: System Notes, Prev: Helper Tools, Up: Top
+
+9 How to do certain things
+**************************
+
+This is a collection of small howto documents.
+
+* Menu:
+
+* Howto Create a Server Cert:: Creating a TLS server certificate.
+
+
+File: gnupg.info, Node: Howto Create a Server Cert, Up: Howtos
+
+9.1 Creating a TLS server certificate
+=====================================
+
+Here is a brief run up on how to create a server certificate. It has
+actually been done this way to get a certificate from CAcert to be used
+on a real server. It has only been tested with this CA, but there
+shouldn't be any problem to run this against any other CA.
+
+ We start by generating an X.509 certificate signing request. As
+there is no need for a configuration file, you may simply enter:
+
+ $ gpgsm --gen-key >example.com.cert-req.pem
+ Please select what kind of key you want:
+ (1) RSA
+ (2) Existing key
+ (3) Existing key from card
+ Your selection? 1
+
+ I opted for creating a new RSA key. The other option is to use an
+already existing key, by selecting '2' and entering the so-called
+keygrip. Running the command 'gpgsm --dump-secret-key USERID' shows you
+this keygrip. Using '3' offers another menu to create a certificate
+directly from a smart card based key.
+
+ Let's continue:
+
+ What keysize do you want? (2048)
+ Requested keysize is 2048 bits
+
+ Hitting enter chooses the default RSA key size of 2048 bits. Smaller
+keys are too weak on the modern Internet. If you choose a larger
+(stronger) key, your server will need to do more work.
+
+ Possible actions for a RSA key:
+ (1) sign, encrypt
+ (2) sign
+ (3) encrypt
+ Your selection? 1
+
+ Selecting "sign" enables use of the key for Diffie-Hellman key
+exchange mechanisms (DHE and ECDHE) in TLS, which are preferred because
+they offer forward secrecy. Selecting "encrypt" enables RSA key
+exchange mechanisms, which are still common in some places. Selecting
+both enables both key exchange mechanisms.
+
+ Now for some real data:
+
+ Enter the X.509 subject name: CN=example.com
+
+ This is the most important value for a server certificate. Enter
+here the canonical name of your server machine. You may add other
+virtual server names later.
+
+ E-Mail addresses (end with an empty line):
+ >
+
+ We don't need email addresses in a TLS server certificate and CAcert
+would anyway ignore such a request. Thus just hit enter.
+
+ If you want to create a client certificate for email encryption, this
+would be the place to enter your mail address (e.g. <joe at example.org>).
+You may enter as many addresses as you like, however the CA may not
+accept them all or reject the entire request.
+
+ Enter DNS names (optional; end with an empty line):
+ > example.com
+ > www.example.com
+ >
+
+ Here I entered the names of the services which the machine actually
+provides. You almost always want to include the canonical name here
+too. The browser will accept a certificate for any of these names. As
+usual the CA must approve all of these names.
+
+ URIs (optional; end with an empty line):
+ >
+
+ It is possible to insert arbitrary URIs into a certificate; for a
+server certificate this does not make sense.
+
+ Create self-signed certificate? (y/N)
+
+ Since we are creating a certificate signing request, and not a full
+certificate, we answer no here, or just hit enter for the default.
+
+ We have now entered all required information and 'gpgsm' will display
+what it has gathered and ask whether to create the certificate request:
+
+ These parameters are used:
+ Key-Type: RSA
+ Key-Length: 2048
+ Key-Usage: sign, encrypt
+ Name-DN: CN=example.com
+ Name-DNS: example.com
+ Name-DNS: www.example.com
+
+ Proceed with creation? (y/N) y
+
+ 'gpgsm' will now start working on creating the request. As this
+includes the creation of an RSA key it may take a while. During this
+time you will be asked 3 times for a passphrase to protect the created
+private key on your system. A pop up window will appear to ask for it.
+The first two prompts are for the new passphrase and for re-entering it;
+the third one is required to actually create the certificate signing
+request.
+
+ When it is ready, you should see the final notice:
+
+ gpgsm: certificate request created
+ Ready. You should now send this request to your CA.
+
+ Now, you may look at the created request:
+
+ $ cat example.com.cert-req.pem
+ -----BEGIN CERTIFICATE REQUEST-----
+ MIIClTCCAX0CAQAwFjEUMBIGA1UEAxMLZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3
+ DQEBAQUAA4IBDwAwggEKAoIBAQDP1QEcbTvOLLCX4gAoOzH9AW7jNOMj7OSOL0uW
+ h2bCdkK5YVpnX212Z6COTC3ZG0pJiCeGt1TbbDJUlTa4syQ6JXavjK66N8ASZsyC
+ Rwcl0m6hbXp541t1dbgt2VgeGk25okWw3j+brw6zxLD2TnthJxOatID0lDIG47HW
+ GqzZmA6WHbIBIONmGnReIHTpPAPCDm92vUkpKG1xLPszuRmsQbwEl870W/FHrsvm
+ DPvVUUSdIvTV9NuRt7/WY6G4nPp9QlIuTf1ESPzIuIE91gKPdrRCAx0yuT708S1n
+ xCv3ETQ/bKPoAQ67eE3mPBqkcVwv9SE/2/36Lz06kAizRgs5AgMBAAGgOjA4Bgkq
+ hkiG9w0BCQ4xKzApMCcGA1UdEQQgMB6CC2V4YW1wbGUuY29tgg93d3cuZXhhbXBs
+ ZS5jb20wDQYJKoZIhvcNAQELBQADggEBAEWD0Qqz4OENLYp6yyO/KqF0ig9FDsLN
+ b5/R+qhms5qlhdB5+Dh+j693Sj0UgbcNKc6JT86IuBqEBZmRCJuXRoKoo5aMS1cJ
+ hXga7N9IA3qb4VBUzBWvlL92U2Iptr/cEbikFlYZF2Zv3PBv8RfopVlI3OLbKV9D
+ bJJTt/6kuoydXKo/Vx4G0DFzIKNdFdJk86o/Ziz8NOs9JjZxw9H9VY5sHKFM5LKk
+ VcLwnnLRlNjBGB+9VK/Tze575eG0cJomTp7UGIB+1xzIQVAhUZOizRDv9tHDeaK3
+ k+tUhV0kuJcYHucpJycDSrP/uAY5zuVJ0rs2QSjdnav62YrRgEsxJrU=
+ -----END CERTIFICATE REQUEST-----
+ $
+
+ You may now proceed by logging into your account at the CAcert
+website, choose 'Server Certificates - New', check 'sign by class 3 root
+certificate', paste the above request block into the text field and
+click on 'Submit'.
+
+ If everything works out fine, a certificate will be shown. Now run
+
+ $ gpgsm --import
+
+ and paste the certificate from the CAcert page into your terminal
+followed by a Ctrl-D
+
+ -----BEGIN CERTIFICATE-----
+ MIIEIjCCAgqgAwIBAgIBTDANBgkqhkiG9w0BAQQFADBUMRQwEgYDVQQKEwtDQWNl
+ [...]
+ rUTFlNElRXCwIl0YcJkIaYYqWf7+A/aqYJCi8+51usZwMy3Jsq3hJ6MA3h1BgwZs
+ Rtct3tIX
+ -----END CERTIFICATE-----
+ gpgsm: issuer certificate (#/CN=CAcert Class 3 Ro[...]) not found
+ gpgsm: certificate imported
+
+ gpgsm: total number processed: 1
+ gpgsm: imported: 1
+
+ gpgsm tells you that it has imported the certificate. It is now
+associated with the key you used when creating the request. The root
+certificate has not been found, so you may want to import it from the
+CACert website.
+
+ To see the content of your certificate, you may now enter:
+
+ $ gpgsm -K example.com
+ /home/foo/.gnupg/pubring.kbx
+ ---------------------------
+ Serial number: 4C
+ Issuer: /CN=CAcert Class 3 Root/OU=http:\x2f\x2fwww.[...]
+ Subject: /CN=example.com
+ aka: (dns-name example.com)
+ aka: (dns-name www.example.com)
+ validity: 2015-07-01 16:20:51 through 2016-07-01 16:20:51
+ key type: 2048 bit RSA
+ key usage: digitalSignature keyEncipherment
+ ext key usage: clientAuth (suggested), serverAuth (suggested), [...]
+ fingerprint: 0F:9C:27:B2:DA:05:5F:CB:33:D8:19:E9:65:B9:4F:BD:B1:98:CC:57
+
+ I used '-K' above because this will only list certificates for which
+a private key is available. To see more details, you may use
+'--dump-secret-keys' instead of '-K'.
+
+ To make actual use of the certificate you need to install it on your
+server. Server software usually expects a PKCS\#12 file with key and
+certificate. To create such a file, run:
+
+ $ gpgsm --export-secret-key-p12 -a >example.com-cert.pem
+
+ You will be asked for the passphrase as well as for a new passphrase
+to be used to protect the PKCS\#12 file. The file now contains the
+certificate as well as the private key:
+
+ $ cat example-cert.pem
+ Issuer ...: /CN=CAcert Class 3 Root/OU=http:\x2f\x2fwww.CA[...]
+ Serial ...: 4C
+ Subject ..: /CN=example.com
+ aka ..: (dns-name example.com)
+ aka ..: (dns-name www.example.com)
+
+ -----BEGIN PKCS12-----
+ MIIHlwIBAzCCB5AGCSqGSIb37QdHAaCCB4EEggd9MIIHeTk1BJ8GCSqGSIb3DQEu
+ [...many more lines...]
+ -----END PKCS12-----
+ $
+
+ Copy this file in a secure way to the server, install it there and
+delete the file then. You may export the file again at any time as long
+as it is available in GnuPG's private key database.
+
+
+File: gnupg.info, Node: System Notes, Next: Debugging, Prev: Howtos, Up: Top
+
+10 Notes pertaining to certain OSes.
+************************************
+
+GnuPG has been developed on GNU/Linux systems and is know to work on
+almost all Free OSes. All modern POSIX systems should be supported
+right now, however there are probably a lot of smaller glitches we need
+to fix first. The major problem areas are:
+
+ * We are planning to use file descriptor passing for interprocess
+ communication. This will allow us save a lot of resources and
+ improve performance of certain operations a lot. Systems not
+ supporting this won't gain these benefits but we try to keep them
+ working the standard way as it is done today.
+
+ * We require more or less full POSIX compatibility. This has been
+ around for 15 years now and thus we don't believe it makes sense to
+ support non POSIX systems anymore. Well, we of course the usual
+ workarounds for near POSIX systems well be applied.
+
+ There is one exception of this rule: Systems based the Microsoft
+ Windows API (called here _W32_) will be supported to some extend.
+
+* Menu:
+
+* W32 Notes:: Microsoft Windows Notes
+
+
+File: gnupg.info, Node: W32 Notes, Up: System Notes
+
+10.1 Microsoft Windows Notes
+============================
+
+Current limitations are:
+
+ * 'gpgconf' does not create backup files, so in case of trouble your
+ configuration file might get lost.
+
+ * 'watchgnupg' is not available. Logging to sockets is not possible.
+
+ * The periodical smartcard status checking done by 'scdaemon' is not
+ yet supported.
+
+
+File: gnupg.info, Node: Debugging, Next: Copying, Prev: System Notes, Up: Top
+
+11 How to solve problems
+************************
+
+Everyone knows that software often does not do what it should do and
+thus there is a need to track down problems. We call this debugging in
+a reminiscent to the moth jamming a relay in a Mark II box back in 1947.
+
+ Most of the problems a merely configuration and user problems but
+nevertheless there are the most annoying ones and responsible for many
+gray hairs. We try to give some guidelines here on how to identify and
+solve the problem at hand.
+
+* Menu:
+
+* Debugging Tools:: Description of some useful tools.
+* Debugging Hints:: Various hints on debugging.
+* Common Problems:: Commonly seen problems.
+* Architecture Details:: How the whole thing works internally.
+
+
+File: gnupg.info, Node: Debugging Tools, Next: Debugging Hints, Up: Debugging
+
+11.1 Debugging Tools
+====================
+
+The GnuPG distribution comes with a couple of tools, useful to help find
+and solving problems.
+
+* Menu:
+
+* kbxutil:: Scrutinizing a keybox file.
+
+
+File: gnupg.info, Node: kbxutil, Up: Debugging Tools
+
+11.1.1 Scrutinizing a keybox file
+---------------------------------
+
+A keybox is a file format used to store public keys along with meta
+information and indices. The commonly used one is the file
+'pubring.kbx' in the '.gnupg' directory. It contains all X.509
+certificates as well as OpenPGP keys(1) .
+
+When called the standard way, e.g.:
+
+ 'kbxutil ~/.gnupg/pubring.kbx'
+
+it lists all records (called blobs) with there meta-information in a
+human readable format.
+
+To see statistics on the keybox in question, run it using
+
+ 'kbxutil --stats ~/.gnupg/pubring.kbx'
+
+and you get an output like:
+
+ Total number of blobs: 99
+ header: 1
+ empty: 0
+ openpgp: 0
+ x509: 98
+ non flagged: 81
+ secret flagged: 0
+ ephemeral flagged: 17
+
+ In this example you see that the keybox does not have any OpenPGP
+keys but contains 98 X.509 certificates and a total of 17 keys or
+certificates are flagged as ephemeral, meaning that they are only
+temporary stored (cached) in the keybox and won't get listed using the
+usual commands provided by 'gpgsm' or 'gpg'. 81 certificates are stored
+in a standard way and directly available from 'gpgsm'.
+
+To find duplicated certificates and keyblocks in a keybox file (this
+should not occur but sometimes things go wrong), run it using
+
+ 'kbxutil --find-dups ~/.gnupg/pubring.kbx'
+
+ ---------- Footnotes ----------
+
+ (1) Well, OpenPGP keys are not implemented, 'gpg' still used the
+keyring file 'pubring.gpg'
+
+
+File: gnupg.info, Node: Debugging Hints, Next: Common Problems, Prev: Debugging Tools, Up: Debugging
+
+11.2 Various hints on debugging.
+================================
+
+ * How to find the IP address of a keyserver
+
+ If a round robin URL of is used for a keyserver (e.g.
+ subkeys.gnupg.org); it is not easy to see what server is actually
+ used. Using the keyserver debug option as in
+
+ gpg --keyserver-options debug=1 -v --refresh-key 1E42B367
+
+ is thus often helpful. Note that the actual output depends on the
+ backend and may change from release to release.
+
+ * Logging on WindowsCE
+
+ For development, the best logging method on WindowsCE is the use of
+ remote debugging using a log file name of 'tcp://<ip-addr>:<port>'.
+ The command 'watchgnupg' may be used on the remote host to listen
+ on the given port. (*note option watchgnupg --tcp::). For in the
+ field tests it is better to make use of the logging facility
+ provided by the 'gpgcedev' driver (part of libassuan); this is
+ enabled by using a log file name of 'GPG2:'. (*note option
+ --log-file::).
+
+
+File: gnupg.info, Node: Common Problems, Next: Architecture Details, Prev: Debugging Hints, Up: Debugging
+
+11.3 Commonly Seen Problems
+===========================
+
+ * Error code 'Not supported' from Dirmngr
+
+ Most likely the option 'enable-ocsp' is active for gpgsm but
+ Dirmngr's OCSP feature has not been enabled using 'allow-ocsp' in
+ 'dirmngr.conf'.
+
+ * The Curses based Pinentry does not work
+
+ The far most common reason for this is that the environment
+ variable 'GPG_TTY' has not been set correctly. Make sure that it
+ has been set to a real tty devce and not just to '/dev/tty'; i.e.
+ 'GPG_TTY=tty' is plainly wrong; what you want is 'GPG_TTY=`tty`' --
+ note the back ticks. Also make sure that this environment variable
+ gets exported, that is you should follow up the setting with an
+ 'export GPG_TTY' (assuming a Bourne style shell). Even for GUI
+ based Pinentries; you should have set 'GPG_TTY'. See the section
+ on installing the 'gpg-agent' on how to do it.
+
+ * SSH hangs while a popping up pinentry was expected
+
+ SSH has no way to tell the gpg-agent what terminal or X display it
+ is running on. So when remotely logging into a box where a
+ gpg-agent with SSH support is running, the pinentry will get popped
+ up on whatever display the gpg-agent has been started. To solve
+ this problem you may issue the command
+
+ echo UPDATESTARTUPTTY | gpg-connect-agent
+
+ and the next pinentry will pop up on your display or screen.
+ However, you need to kill the running pinentry first because only
+ one pinentry may be running at once. If you plan to use ssh on a
+ new display you should issue the above command before invoking ssh
+ or any other service making use of ssh.
+
+ * Exporting a secret key without a certificate
+
+ I may happen that you have created a certificate request using
+ 'gpgsm' but not yet received and imported the certificate from the
+ CA. However, you want to export the secret key to another machine
+ right now to import the certificate over there then. You can do
+ this with a little trick but it requires that you know the
+ approximate time you created the signing request. By running the
+ command
+
+ ls -ltr ~/.gnupg/private-keys-v1.d
+
+ you get a listing of all private keys under control of 'gpg-agent'.
+ Pick the key which best matches the creation time and run the
+ command
+
+ /usr/local/libexec/gpg-protect-tool --p12-export \
+ ~/.gnupg/private-keys-v1.d/FOO >FOO.p12
+
+ (Please adjust the path to 'gpg-protect-tool' to the appropriate
+ location). FOO is the name of the key file you picked (it should
+ have the suffix '.key'). A Pinentry box will pop up and ask you
+ for the current passphrase of the key and a new passphrase to
+ protect it in the pkcs#12 file.
+
+ To import the created file on the machine you use this command:
+
+ /usr/local/libexec/gpg-protect-tool --p12-import --store FOO.p12
+
+ You will be asked for the pkcs#12 passphrase and a new passphrase
+ to protect the imported private key at its new location.
+
+ Note that there is no easy way to match existing certificates with
+ stored private keys because some private keys are used for Secure
+ Shell or other purposes and don't have a corresponding certificate.
+
+ * A root certificate does not verify
+
+ A common problem is that the root certificate misses the required
+ basicConstraints attribute and thus 'gpgsm' rejects this
+ certificate. An error message indicating "no value" is a sign for
+ such a certificate. You may use the 'relax' flag in
+ 'trustlist.txt' to accept the certificate anyway. Note that the
+ fingerprint and this flag may only be added manually to
+ 'trustlist.txt'.
+
+ * Error message: "digest algorithm N has not been enabled"
+
+ The signature is broken. You may try the option
+ '--extra-digest-algo SHA256' to workaround the problem. The number
+ N is the internal algorithm identifier; for example 8 refers to
+ SHA-256.
+
+ * The Windows version does not work under Wine
+
+ When running the W32 version of 'gpg' under Wine you may get an
+ error messages like:
+
+ gpg: fatal: WriteConsole failed: Access denied
+
+ The solution is to use the command 'wineconsole'.
+
+ Some operations like gen-key really want to talk to the console
+ directly for increased security (for example to prevent the
+ passphrase from appearing on the screen). So, you should use
+ 'wineconsole' instead of 'wine', which will launch a windows
+ console that implements those additional features.
+
+ * Why does GPG's -search-key list weird keys?
+
+ For performance reasons the keyservers do not check the keys the
+ same way 'gpg' does. It may happen that the listing of keys
+ available on the keyservers shows keys with wrong user IDs or with
+ user Ids from other keys. If you try to import this key, the bad
+ keys or bad user ids won't get imported, though. This is a bit
+ unfortunate but we can't do anything about it without actually
+ downloading the keys.
+
+
+File: gnupg.info, Node: Architecture Details, Prev: Common Problems, Up: Debugging
+
+11.4 How the whole thing works internally.
+==========================================
+
+* Menu:
+
+* Component interaction:: How the components work together.
+* GnuPG-1 and GnuPG-2:: Relationship between GnuPG 1.4 and 2.x.
+
+
+File: gnupg.info, Node: Component interaction, Next: GnuPG-1 and GnuPG-2, Up: Architecture Details
+
+11.4.1 How the components work together.
+----------------------------------------
+
+
+
+Figure 11.1: GnuPG module overview
+
+
+File: gnupg.info, Node: GnuPG-1 and GnuPG-2, Prev: Component interaction, Up: Architecture Details
+
+11.4.2 Relationship between GnuPG 1.4 and 2.x.
+----------------------------------------------
+
+Here is a little picture showing how the different GnuPG versions make
+use of a smartcard:
+
+
+
+Figure 11.2: GnuPG card architecture
+
+
+File: gnupg.info, Node: Copying, Next: Contributors, Prev: Debugging, Up: Top
+
+GNU General Public License
+**************************
+
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+
+ Everyone is permitted to copy and distribute verbatim copies of this
+ license document, but changing it is not allowed.
+
+Preamble
+========
+
+The GNU General Public License is a free, copyleft license for software
+and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program-to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public
+ License.
+
+ "Copyright" also means copyright-like laws that apply to other
+ kinds of works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+ License. Each licensee is addressed as "you". "Licensees" and
+ "recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the
+ work in a fashion requiring copyright permission, other than the
+ making of an exact copy. The resulting work is called a "modified
+ version" of the earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work
+ based on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+ permission, would make you directly or secondarily liable for
+ infringement under applicable copyright law, except executing it on
+ a computer or modifying a private copy. Propagation includes
+ copying, distribution (with or without modification), making
+ available to the public, and in some countries other activities as
+ well.
+
+ To "convey" a work means any kind of propagation that enables other
+ parties to make or receive copies. Mere interaction with a user
+ through a computer network, with no transfer of a copy, is not
+ conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+ to the extent that it includes a convenient and prominently visible
+ feature that (1) displays an appropriate copyright notice, and (2)
+ tells the user that there is no warranty for the work (except to
+ the extent that warranties are provided), that licensees may convey
+ the work under this License, and how to view a copy of this
+ License. If the interface presents a list of user commands or
+ options, such as a menu, a prominent item in the list meets this
+ criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+ for making modifications to it. "Object code" means any non-source
+ form of a work.
+
+ A "Standard Interface" means an interface that either is an
+ official standard defined by a recognized standards body, or, in
+ the case of interfaces specified for a particular programming
+ language, one that is widely used among developers working in that
+ language.
+
+ The "System Libraries" of an executable work include anything,
+ other than the work as a whole, that (a) is included in the normal
+ form of packaging a Major Component, but which is not part of that
+ Major Component, and (b) serves only to enable use of the work with
+ that Major Component, or to implement a Standard Interface for
+ which an implementation is available to the public in source code
+ form. A "Major Component", in this context, means a major
+ essential component (kernel, window system, and so on) of the
+ specific operating system (if any) on which the executable work
+ runs, or a compiler used to produce the work, or an object code
+ interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+ the source code needed to generate, install, and (for an executable
+ work) run the object code and to modify the work, including scripts
+ to control those activities. However, it does not include the
+ work's System Libraries, or general-purpose tools or generally
+ available free programs which are used unmodified in performing
+ those activities but which are not part of the work. For example,
+ Corresponding Source includes interface definition files associated
+ with source files for the work, and the source code for shared
+ libraries and dynamically linked subprograms that the work is
+ specifically designed to require, such as by intimate data
+ communication or control flow between those subprograms and other
+ parts of the work.
+
+ The Corresponding Source need not include anything that users can
+ regenerate automatically from other parts of the Corresponding
+ Source.
+
+ The Corresponding Source for a work in source code form is that
+ same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+ copyright on the Program, and are irrevocable provided the stated
+ conditions are met. This License explicitly affirms your unlimited
+ permission to run the unmodified Program. The output from running
+ a covered work is covered by this License only if the output, given
+ its content, constitutes a covered work. This License acknowledges
+ your rights of fair use or other equivalent, as provided by
+ copyright law.
+
+ You may make, run and propagate covered works that you do not
+ convey, without conditions so long as your license otherwise
+ remains in force. You may convey covered works to others for the
+ sole purpose of having them make modifications exclusively for you,
+ or provide you with facilities for running those works, provided
+ that you comply with the terms of this License in conveying all
+ material for which you do not control copyright. Those thus making
+ or running the covered works for you must do so exclusively on your
+ behalf, under your direction and control, on terms that prohibit
+ them from making any copies of your copyrighted material outside
+ their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+ the conditions stated below. Sublicensing is not allowed; section
+ 10 makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+ measure under any applicable law fulfilling obligations under
+ article 11 of the WIPO copyright treaty adopted on 20 December
+ 1996, or similar laws prohibiting or restricting circumvention of
+ such measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+ circumvention of technological measures to the extent such
+ circumvention is effected by exercising rights under this License
+ with respect to the covered work, and you disclaim any intention to
+ limit operation or modification of the work as a means of
+ enforcing, against the work's users, your or third parties' legal
+ rights to forbid circumvention of technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+ receive it, in any medium, provided that you conspicuously and
+ appropriately publish on each copy an appropriate copyright notice;
+ keep intact all notices stating that this License and any
+ non-permissive terms added in accord with section 7 apply to the
+ code; keep intact all notices of the absence of any warranty; and
+ give all recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+ and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+ produce it from the Program, in the form of source code under the
+ terms of section 4, provided that you also meet all of these
+ conditions:
+
+ a. The work must carry prominent notices stating that you
+ modified it, and giving a relevant date.
+
+ b. The work must carry prominent notices stating that it is
+ released under this License and any conditions added under
+ section 7. This requirement modifies the requirement in
+ section 4 to "keep intact all notices".
+
+ c. You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable
+ section 7 additional terms, to the whole of the work, and all
+ its parts, regardless of how they are packaged. This License
+ gives no permission to license the work in any other way, but
+ it does not invalidate such permission if you have separately
+ received it.
+
+ d. If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has
+ interactive interfaces that do not display Appropriate Legal
+ Notices, your work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+ works, which are not by their nature extensions of the covered
+ work, and which are not combined with it such as to form a larger
+ program, in or on a volume of a storage or distribution medium, is
+ called an "aggregate" if the compilation and its resulting
+ copyright are not used to limit the access or legal rights of the
+ compilation's users beyond what the individual works permit.
+ Inclusion of a covered work in an aggregate does not cause this
+ License to apply to the other parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+ of sections 4 and 5, provided that you also convey the
+ machine-readable Corresponding Source under the terms of this
+ License, in one of these ways:
+
+ a. Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b. Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that
+ product model, to give anyone who possesses the object code
+ either (1) a copy of the Corresponding Source for all the
+ software in the product that is covered by this License, on a
+ durable physical medium customarily used for software
+ interchange, for a price no more than your reasonable cost of
+ physically performing this conveying of source, or (2) access
+ to copy the Corresponding Source from a network server at no
+ charge.
+
+ c. Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially,
+ and only if you received the object code with such an offer,
+ in accord with subsection 6b.
+
+ d. Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to
+ the Corresponding Source in the same way through the same
+ place at no further charge. You need not require recipients
+ to copy the Corresponding Source along with the object code.
+ If the place to copy the object code is a network server, the
+ Corresponding Source may be on a different server (operated by
+ you or a third party) that supports equivalent copying
+ facilities, provided you maintain clear directions next to the
+ object code saying where to find the Corresponding Source.
+ Regardless of what server hosts the Corresponding Source, you
+ remain obligated to ensure that it is available for as long as
+ needed to satisfy these requirements.
+
+ e. Convey the object code using peer-to-peer transmission,
+ provided you inform other peers where the object code and
+ Corresponding Source of the work are being offered to the
+ general public at no charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is
+ excluded from the Corresponding Source as a System Library, need
+ not be included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means
+ any tangible personal property which is normally used for personal,
+ family, or household purposes, or (2) anything designed or sold for
+ incorporation into a dwelling. In determining whether a product is
+ a consumer product, doubtful cases shall be resolved in favor of
+ coverage. For a particular product received by a particular user,
+ "normally used" refers to a typical or common use of that class of
+ product, regardless of the status of the particular user or of the
+ way in which the particular user actually uses, or expects or is
+ expected to use, the product. A product is a consumer product
+ regardless of whether the product has substantial commercial,
+ industrial or non-consumer uses, unless such uses represent the
+ only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+ procedures, authorization keys, or other information required to
+ install and execute modified versions of a covered work in that
+ User Product from a modified version of its Corresponding Source.
+ The information must suffice to ensure that the continued
+ functioning of the modified object code is in no case prevented or
+ interfered with solely because modification has been made.
+
+ If you convey an object code work under this section in, or with,
+ or specifically for use in, a User Product, and the conveying
+ occurs as part of a transaction in which the right of possession
+ and use of the User Product is transferred to the recipient in
+ perpetuity or for a fixed term (regardless of how the transaction
+ is characterized), the Corresponding Source conveyed under this
+ section must be accompanied by the Installation Information. But
+ this requirement does not apply if neither you nor any third party
+ retains the ability to install modified object code on the User
+ Product (for example, the work has been installed in ROM).
+
+ The requirement to provide Installation Information does not
+ include a requirement to continue to provide support service,
+ warranty, or updates for a work that has been modified or installed
+ by the recipient, or for the User Product in which it has been
+ modified or installed. Access to a network may be denied when the
+ modification itself materially and adversely affects the operation
+ of the network or violates the rules and protocols for
+ communication across the network.
+
+ Corresponding Source conveyed, and Installation Information
+ provided, in accord with this section must be in a format that is
+ publicly documented (and with an implementation available to the
+ public in source code form), and must require no special password
+ or key for unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of
+ this License by making exceptions from one or more of its
+ conditions. Additional permissions that are applicable to the
+ entire Program shall be treated as though they were included in
+ this License, to the extent that they are valid under applicable
+ law. If additional permissions apply only to part of the Program,
+ that part may be used separately under those permissions, but the
+ entire Program remains governed by this License without regard to
+ the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+ remove any additional permissions from that copy, or from any part
+ of it. (Additional permissions may be written to require their own
+ removal in certain cases when you modify the work.) You may place
+ additional permissions on material, added by you to a covered work,
+ for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material
+ you add to a covered work, you may (if authorized by the copyright
+ holders of that material) supplement the terms of this License with
+ terms:
+
+ a. Disclaiming warranty or limiting liability differently from
+ the terms of sections 15 and 16 of this License; or
+
+ b. Requiring preservation of specified reasonable legal notices
+ or author attributions in that material or in the Appropriate
+ Legal Notices displayed by works containing it; or
+
+ c. Prohibiting misrepresentation of the origin of that material,
+ or requiring that modified versions of such material be marked
+ in reasonable ways as different from the original version; or
+
+ d. Limiting the use for publicity purposes of names of licensors
+ or authors of the material; or
+
+ e. Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f. Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified
+ versions of it) with contractual assumptions of liability to
+ the recipient, for any liability that these contractual
+ assumptions directly impose on those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+ restrictions" within the meaning of section 10. If the Program as
+ you received it, or any part of it, contains a notice stating that
+ it is governed by this License along with a term that is a further
+ restriction, you may remove that term. If a license document
+ contains a further restriction but permits relicensing or conveying
+ under this License, you may add to a covered work material governed
+ by the terms of that license document, provided that the further
+ restriction does not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+ must place, in the relevant source files, a statement of the
+ additional terms that apply to those files, or a notice indicating
+ where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in
+ the form of a separately written license, or stated as exceptions;
+ the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+ provided under this License. Any attempt otherwise to propagate or
+ modify it is void, and will automatically terminate your rights
+ under this License (including any patent licenses granted under the
+ third paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+ license from a particular copyright holder is reinstated (a)
+ provisionally, unless and until the copyright holder explicitly and
+ finally terminates your license, and (b) permanently, if the
+ copyright holder fails to notify you of the violation by some
+ reasonable means prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+ reinstated permanently if the copyright holder notifies you of the
+ violation by some reasonable means, this is the first time you have
+ received notice of violation of this License (for any work) from
+ that copyright holder, and you cure the violation prior to 30 days
+ after your receipt of the notice.
+
+ Termination of your rights under this section does not terminate
+ the licenses of parties who have received copies or rights from you
+ under this License. If your rights have been terminated and not
+ permanently reinstated, you do not qualify to receive new licenses
+ for the same material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+ run a copy of the Program. Ancillary propagation of a covered work
+ occurring solely as a consequence of using peer-to-peer
+ transmission to receive a copy likewise does not require
+ acceptance. However, nothing other than this License grants you
+ permission to propagate or modify any covered work. These actions
+ infringe copyright if you do not accept this License. Therefore,
+ by modifying or propagating a covered work, you indicate your
+ acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+ receives a license from the original licensors, to run, modify and
+ propagate that work, subject to this License. You are not
+ responsible for enforcing compliance by third parties with this
+ License.
+
+ An "entity transaction" is a transaction transferring control of an
+ organization, or substantially all assets of one, or subdividing an
+ organization, or merging organizations. If propagation of a
+ covered work results from an entity transaction, each party to that
+ transaction who receives a copy of the work also receives whatever
+ licenses to the work the party's predecessor in interest had or
+ could give under the previous paragraph, plus a right to possession
+ of the Corresponding Source of the work from the predecessor in
+ interest, if the predecessor has it or can get it with reasonable
+ efforts.
+
+ You may not impose any further restrictions on the exercise of the
+ rights granted or affirmed under this License. For example, you
+ may not impose a license fee, royalty, or other charge for exercise
+ of rights granted under this License, and you may not initiate
+ litigation (including a cross-claim or counterclaim in a lawsuit)
+ alleging that any patent claim is infringed by making, using,
+ selling, offering for sale, or importing the Program or any portion
+ of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+ License of the Program or a work on which the Program is based.
+ The work thus licensed is called the contributor's "contributor
+ version".
+
+ A contributor's "essential patent claims" are all patent claims
+ owned or controlled by the contributor, whether already acquired or
+ hereafter acquired, that would be infringed by some manner,
+ permitted by this License, of making, using, or selling its
+ contributor version, but do not include claims that would be
+ infringed only as a consequence of further modification of the
+ contributor version. For purposes of this definition, "control"
+ includes the right to grant patent sublicenses in a manner
+ consistent with the requirements of this License.
+
+ Each contributor grants you a non-exclusive, worldwide,
+ royalty-free patent license under the contributor's essential
+ patent claims, to make, use, sell, offer for sale, import and
+ otherwise run, modify and propagate the contents of its contributor
+ version.
+
+ In the following three paragraphs, a "patent license" is any
+ express agreement or commitment, however denominated, not to
+ enforce a patent (such as an express permission to practice a
+ patent or covenant not to sue for patent infringement). To "grant"
+ such a patent license to a party means to make such an agreement or
+ commitment not to enforce a patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent
+ license, and the Corresponding Source of the work is not available
+ for anyone to copy, free of charge and under the terms of this
+ License, through a publicly available network server or other
+ readily accessible means, then you must either (1) cause the
+ Corresponding Source to be so available, or (2) arrange to deprive
+ yourself of the benefit of the patent license for this particular
+ work, or (3) arrange, in a manner consistent with the requirements
+ of this License, to extend the patent license to downstream
+ recipients. "Knowingly relying" means you have actual knowledge
+ that, but for the patent license, your conveying the covered work
+ in a country, or your recipient's use of the covered work in a
+ country, would infringe one or more identifiable patents in that
+ country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+ arrangement, you convey, or propagate by procuring conveyance of, a
+ covered work, and grant a patent license to some of the parties
+ receiving the covered work authorizing them to use, propagate,
+ modify or convey a specific copy of the covered work, then the
+ patent license you grant is automatically extended to all
+ recipients of the covered work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+ the scope of its coverage, prohibits the exercise of, or is
+ conditioned on the non-exercise of one or more of the rights that
+ are specifically granted under this License. You may not convey a
+ covered work if you are a party to an arrangement with a third
+ party that is in the business of distributing software, under which
+ you make payment to the third party based on the extent of your
+ activity of conveying the work, and under which the third party
+ grants, to any of the parties who would receive the covered work
+ from you, a discriminatory patent license (a) in connection with
+ copies of the covered work conveyed by you (or copies made from
+ those copies), or (b) primarily for and in connection with specific
+ products or compilations that contain the covered work, unless you
+ entered into that arrangement, or that patent license was granted,
+ prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+ any implied license or other defenses to infringement that may
+ otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement
+ or otherwise) that contradict the conditions of this License, they
+ do not excuse you from the conditions of this License. If you
+ cannot convey a covered work so as to satisfy simultaneously your
+ obligations under this License and any other pertinent obligations,
+ then as a consequence you may not convey it at all. For example,
+ if you agree to terms that obligate you to collect a royalty for
+ further conveying from those to whom you convey the Program, the
+ only way you could satisfy both those terms and this License would
+ be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+ permission to link or combine any covered work with a work licensed
+ under version 3 of the GNU Affero General Public License into a
+ single combined work, and to convey the resulting work. The terms
+ of this License will continue to apply to the part which is the
+ covered work, but the special requirements of the GNU Affero
+ General Public License, section 13, concerning interaction through
+ a network will apply to the combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new
+ versions of the GNU General Public License from time to time. Such
+ new versions will be similar in spirit to the present version, but
+ may differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+ Program specifies that a certain numbered version of the GNU
+ General Public License "or any later version" applies to it, you
+ have the option of following the terms and conditions either of
+ that numbered version or of any later version published by the Free
+ Software Foundation. If the Program does not specify a version
+ number of the GNU General Public License, you may choose any
+ version ever published by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+ versions of the GNU General Public License can be used, that
+ proxy's public statement of acceptance of a version permanently
+ authorizes you to choose that version for the Program.
+
+ Later license versions may give you additional or different
+ permissions. However, no additional obligations are imposed on any
+ author or copyright holder as a result of your choosing to follow a
+ later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+ APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE
+ COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS"
+ WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE
+ RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.
+ SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+ NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+ WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES
+ AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
+ DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+ CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
+ THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
+ BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+ PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+ above cannot be given local legal effect according to their terms,
+ reviewing courts shall apply local law that most closely
+ approximates an absolute waiver of all civil liability in
+ connection with the Program, unless a warranty or assumption of
+ liability accompanies a copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+=============================================
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES.
+ Copyright (C) YEAR NAME OF AUTHOR
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program does terminal interaction, make it output a short notice
+like this when it starts in an interactive mode:
+
+ PROGRAM Copyright (C) YEAR NAME OF AUTHOR
+ This program comes with ABSOLUTELY NO WARRANTY; for details
+ type 'show w'. This is free software, and you are
+ welcome to redistribute it under certain conditions;
+ type 'show c' for details.
+
+ The hypothetical commands 'show w' and 'show c' should show the
+appropriate parts of the General Public License. Of course, your
+program's commands might be different; for a GUI interface, you would
+use an "about box".
+
+ You should also get your employer (if you work as a programmer) or
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. For more information on this, and how to apply and follow
+the GNU GPL, see <http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your
+program into proprietary programs. If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library. If this is what you want to do, use the
+GNU Lesser General Public License instead of this License. But first,
+please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+
+File: gnupg.info, Node: Contributors, Next: Glossary, Prev: Copying, Up: Top
+
+Contributors to GnuPG
+*********************
+
+The GnuPG project would like to thank its many contributors. Without
+them the project would not have been nearly as successful as it has
+been. Any omissions in this list are accidental. Feel free to contact
+the maintainer if you have been left out or some of your contributions
+are not listed.
+
+ David Shaw, Matthew Skala, Michael Roth, Niklas Hernaeus, Nils
+Ellmenreich, R�mi Guyomarch, Stefan Bellon, Timo Schulz and Werner Koch
+wrote the code. Birger Langkjer, Daniel Resare, Dokianakis Theofanis,
+Edmund GRIMLEY EVANS, Ga�l Qu�ri, Gregory Steuck, Nagy Ferenc L�szl�,
+Ivo Timmermans, Jacobo Tarri'o Barreiro, Janusz Aleksander Urbanowicz,
+Jedi Lin, Jouni Hiltunen, Laurentiu Buzdugan, Magda Procha'zkova',
+Michael Anckaert, Michal Majer, Marco d'Itri, Nilgun Belma Buguner,
+Pedro Morais, Tedi Heriyanto, Thiago Jung Bauermann, Rafael Caetano dos
+Santos, Toomas Soome, Urko Lusa, Walter Koch, Yosiaki IIDA did the
+official translations. Mike Ashley wrote and maintains the GNU Privacy
+Handbook. David Scribner is the current FAQ editor. Lorenzo
+Cappelletti maintains the web site.
+
+ The new modularized architecture of gnupg 1.9 as well as the
+X.509/CMS part has been developed as part of the �gypten project.
+Direct contributors to this project are: Bernhard Herzog, who did
+extensive testing and tracked down a lot of bugs. Bernhard Reiter, who
+made sure that we met the specifications and the deadlines. He did
+extensive testing and came up with a lot of suggestions. Jan-Oliver
+Wagner made sure that we met the specifications and the deadlines. He
+also did extensive testing and came up with a lot of suggestions.
+Karl-Heinz Zimmer and Marc Mutz had to struggle with all the bugs and
+misconceptions while working on KDE integration. Marcus Brinkman
+extended GPGME, cleaned up the Assuan code and fixed bugs all over the
+place. Moritz Schulte took over Libgcrypt maintenance and developed it
+into a stable an useful library. Steffen Hansen had a hard time to
+write the dirmngr due to underspecified interfaces. Thomas Koester did
+extensive testing and tracked down a lot of bugs. Werner Koch designed
+the system and wrote most of the code.
+
+ The following people helped greatly by suggesting improvements,
+testing, fixing bugs, providing resources and doing other important
+tasks: Adam Mitchell, Albert Chin, Alec Habig, Allan Clark, Anand
+Kumria, Andreas Haumer, Anthony Mulcahy, Ariel T Glenn, Bob Mathews,
+Bodo Moeller, Brendan O'Dea, Brenno de Winter, Brian M. Carlson, Brian
+Moore, Brian Warner, Bryan Fullerton, Caskey L. Dickson, Cees van de
+Griend, Charles Levert, Chip Salzenberg, Chris Adams, Christian Biere,
+Christian Kurz, Christian von Roques, Christopher Oliver, Christian
+Recktenwald, Dan Winship, Daniel Eisenbud, Daniel Koening, Dave Dykstra,
+David C Niemi, David Champion, David Ellement, David Hallinan, David
+Hollenberg, David Mathog, David R. Bergstein, Detlef Lannert, Dimitri,
+Dirk Lattermann, Dirk Meyer, Disastry, Douglas Calvert, Ed Boraas,
+Edmund GRIMLEY EVANS, Edwin Woudt, Enzo Michelangeli, Ernst Molitor,
+Fabio Coatti, Felix von Leitner, fish stiqz, Florian Weimer, Francesco
+Potorti, Frank Donahoe, Frank Heckenbach, Frank Stajano, Frank Tobin,
+Gabriel Rosenkoetter, Ga�l Qu�ri, Gene Carter, Geoff Keating, Georg
+Schwarz, Giampaolo Tomassoni, Gilbert Fernandes, Greg Louis, Greg
+Troxel, Gregory Steuck, Gregery Barton, Harald Denker, Holger Baust,
+Hendrik Buschkamp, Holger Schurig, Holger Smolinski, Holger Trapp, Hugh
+Daniel, Huy Le, Ian McKellar, Ivo Timmermans, Jan Krueger, Jan
+Niehusmann, Janusz A. Urbanowicz, James Troup, Jean-loup Gailly, Jeff
+Long, Jeffery Von Ronne, Jens Bachem, Jeroen C. van Gelderen, J Horacio
+MG, J. Michael Ashley, Jim Bauer, Jim Small, Joachim Backes, Joe Rhett,
+John A. Martin, Johnny Teve�en, J�rg Schilling, Jos Backus, Joseph
+Walton, Juan F. Codagnone, Jun Kuriyama, Kahil D. Jallad, Karl Fogel,
+Karsten Thygesen, Katsuhiro Kondou, Kazu Yamamoto, Keith Clayton, Kevin
+Ryde, Klaus Singvogel, Kurt Garloff, Lars Kellogg-Stedman, L. Sassaman,
+M Taylor, Marcel Waldvogel, Marco d'Itri, Marco Parrone, Marcus
+Brinkmann, Mark Adler, Mark Elbrecht, Mark Pettit, Markus Friedl, Martin
+Kahlert, Martin Hamilton, Martin Schulte, Matt Kraai, Matthew Skala,
+Matthew Wilcox, Matthias Urlichs, Max Valianskiy, Michael Engels,
+Michael Fischer v. Mollard, Michael Roth, Michael Sobolev, Michael
+Tokarev, Nicolas Graner, Mike McEwan, Neal H Walfield, Nelson H. F.
+Beebe, NIIBE Yutaka, Niklas Hernaeus, Nimrod Zimerman, N J Doye, Oliver
+Haakert, Oskari J��skel�inen, Pascal Scheffers, Paul D. Smith, Per
+Cederqvist, Phil Blundell, Philippe Laliberte, Peter Fales, Peter
+Gutmann, Peter Marschall, Peter Valchev, Piotr Krukowiecki, QingLong,
+Ralph Gillen, Rat, Reinhard Wobst, R�mi Guyomarch, Reuben Sumner,
+Richard Outerbridge, Robert Joop, Roddy Strachan, Roger Sondermann,
+Roland Rosenfeld, Roman Pavlik, Ross Golder, Ryan Malayter, Sam Roberts,
+Sami Tolvanen, Sean MacLennan, Sebastian Klemke, Serge Munhoven, SL
+Baur, Stefan Bellon, Dr.Stefan.Dalibor, Stefan Karrmann, Stefan Keller,
+Steffen Ullrich, Steffen Zahn, Steven Bakker, Steven Murdoch, Susanne
+Schultz, Ted Cabeen, Thiago Jung Bauermann, Thijmen Klok, Thomas
+Roessler, Tim Mooney, Timo Schulz, Todd Vierling, TOGAWA Satoshi, Tom
+Spindler, Tom Zerucha, Tomas Fasth, Tommi Komulainen, Thomas Klausner,
+Tomasz Kozlowski, Thomas Mikkelsen, Ulf M�ller, Urko Lusa, Vincent P.
+Broman, Volker Quetschke, W Lewis, Walter Hofmann, Walter Koch, Wayne
+Chapeskie, Wim Vandeputte, Winona Brown, Yosiaki IIDA, Yoshihiro Kajiki
+and Gerlinde Klaes.
+
+ This software has been made possible by the previous work of Chris
+Wedgwood, Jean-loup Gailly, Jon Callas, Mark Adler, Martin Hellmann Paul
+Kendall, Philip R. Zimmermann, Peter Gutmann, Philip A. Nelson, Taher
+Elgamal, Torbjorn Granlund, Whitfield Diffie, some unknown NSA
+mathematicians and all the folks who have worked hard to create complete
+and free operating systems.
+
+ And finally we'd like to thank everyone who uses these tools, submits
+bug reports and generally reminds us why we're doing this work in the
+first place.
+
+
+File: gnupg.info, Node: Glossary, Next: Option Index, Prev: Contributors, Up: Top
+
+Glossary
+********
+
+'ARL'
+ The _Authority Revocation List_ is technical identical to a CRL but
+ used for CAs and not for end user certificates.
+
+'Chain model'
+ Verification model for X.509 which uses the creation date of a
+ signature as the date the validation starts and in turn checks that
+ each certificate has been issued within the time frame, the issuing
+ certificate was valid. This allows the verification of signatures
+ after the CA's certificate expired. The validation test also
+ required an online check of the certificate status. The chain
+ model is required by the German signature law. See also _Shell
+ model_.
+
+'CMS'
+ The _Cryptographic Message Standard_ describes a message format for
+ encryption and digital signing. It is closely related to the X.509
+ certificate format. CMS was formerly known under the name 'PKCS#7'
+ and is described by 'RFC3369'.
+
+'CRL'
+ The _Certificate Revocation List_ is a list containing certificates
+ revoked by the issuer.
+
+'CSR'
+ The _Certificate Signing Request_ is a message send to a CA to ask
+ them to issue a new certificate. The data format of such a signing
+ request is called PCKS#10.
+
+'OpenPGP'
+ A data format used to build a PKI and to exchange encrypted or
+ signed messages. In contrast to X.509, OpenPGP also includes the
+ message format but does not explicitly demand a specific PKI.
+ However any kind of PKI may be build upon the OpenPGP protocol.
+
+'Keygrip'
+ This term is used by GnuPG to describe a 20 byte hash value used to
+ identify a certain key without referencing to a concrete protocol.
+ It is used internally to access a private key. Usually it is shown
+ and entered as a 40 character hexadecimal formatted string.
+
+'OCSP'
+ The _Online Certificate Status Protocol_ is used as an alternative
+ to a CRL. It is described in 'RFC 2560'.
+
+'PSE'
+ The _Personal Security Environment_ describes a database to store
+ private keys. This is either a smartcard or a collection of files
+ on a disk; the latter is often called a Soft-PSE.
+
+'Shell model'
+ The standard model for validation of certificates under X.509. At
+ the time of the verification all certificates must be valid and not
+ expired. See also _Chain mode_.
+
+'X.509'
+ Description of a PKI used with CMS. It is for example defined by
+ 'RFC3280'.
+
+
+File: gnupg.info, Node: Option Index, Next: Environment Index, Prev: Glossary, Up: Top
+
+Option Index
+************
+
+
+* Menu:
+
+* add-servers: Dirmngr Options. (line 195)
+* agent-program: GPG Configuration Options.
- (line 710)
++ (line 692)
+* agent-program <1>: Configuration Options.
+ (line 46)
+* agent-program <2>: Invoking gpg-connect-agent.
+ (line 42)
+* allow-admin: Scdaemon Options. (line 192)
+* allow-emacs-pinentry: Agent Options. (line 179)
+* allow-freeform-uid: GPG Esoteric Options.
+ (line 335)
+* allow-loopback-pinentry: Agent Options. (line 161)
+* allow-multiple-messages: GPG Esoteric Options.
+ (line 475)
+* allow-non-selfsigned-uid: GPG Esoteric Options.
+ (line 330)
+* allow-ocsp: Dirmngr Options. (line 212)
+* allow-preset-passphrase: Agent Options. (line 156)
+* allow-secret-key-import: GPG Esoteric Options.
+ (line 471)
+* allow-weak-digest-algos: GPG Esoteric Options.
+ (line 370)
+* always-trust: Deprecated Options. (line 21)
+* armor: GPG Input and Output.
+ (line 8)
+* armor <1>: Input and Output. (line 8)
+* ask-cert-expire: GPG Esoteric Options.
+ (line 458)
+* ask-cert-level: GPG Configuration Options.
+ (line 339)
+* ask-sig-expire: GPG Esoteric Options.
+ (line 444)
+* assume-armor: Input and Output. (line 14)
+* assume-base64: Input and Output. (line 18)
+* assume-binary: Input and Output. (line 21)
+* attribute-fd: GPG Esoteric Options.
+ (line 87)
+* attribute-file: GPG Esoteric Options.
+ (line 93)
+* auto-check-trustdb: GPG Configuration Options.
- (line 697)
++ (line 679)
+* auto-issuer-key-retrieve: Certificate Options. (line 50)
+* auto-key-locate: GPG Configuration Options.
+ (line 477)
+* auto-key-retrieve: GPG Configuration Options.
+ (line 529)
+* base64: Input and Output. (line 11)
+* batch: Agent Options. (line 44)
+* batch <1>: GPG Configuration Options.
+ (line 43)
+* bzip2-compress-level: GPG Configuration Options.
+ (line 313)
+* bzip2-decompress-lowmem: GPG Configuration Options.
+ (line 323)
+* c: Dirmngr Options. (line 81)
+* cache-cert: dirmngr-client. (line 72)
+* call-dirmngr: Operational GPGSM Commands.
+ (line 27)
+* call-protect-tool: Operational GPGSM Commands.
+ (line 41)
+* card-edit: Operational GPG Commands.
- (line 174)
++ (line 175)
+* card-status: Operational GPG Commands.
- (line 180)
++ (line 181)
+* card-timeout: Scdaemon Options. (line 168)
+* cert-digest-algo: GPG Esoteric Options.
+ (line 227)
+* cert-notation: GPG Esoteric Options.
+ (line 119)
+* cert-policy-url: GPG Esoteric Options.
+ (line 149)
+* change-pin: Operational GPG Commands.
- (line 183)
++ (line 184)
+* check-passphrase-pattern: Agent Options. (line 229)
+* check-sigs: Operational GPG Commands.
+ (line 140)
+* check-trustdb: Operational GPG Commands.
- (line 306)
++ (line 307)
+* cipher-algo: GPG Esoteric Options.
+ (line 188)
+* cipher-algo <1>: CMS Options. (line 13)
+* clearsign: Operational GPG Commands.
+ (line 17)
+* command-fd: GPG Esoteric Options.
+ (line 318)
+* command-file: GPG Esoteric Options.
+ (line 325)
+* comment: GPG Esoteric Options.
+ (line 98)
+* compliant-needed: GPG Configuration Options.
+ (line 654)
+* compress-algo: GPG Esoteric Options.
+ (line 204)
+* compress-level: GPG Configuration Options.
+ (line 313)
+* create-socketdir: Invoking gpgconf. (line 68)
+* csh: Agent Options. (line 134)
+* csh <1>: Dirmngr Options. (line 81)
+* ctapi-driver: Scdaemon Options. (line 145)
+* daemon: Agent Commands. (line 27)
+* daemon <1>: Dirmngr Commands. (line 27)
+* daemon <2>: Scdaemon Commands. (line 31)
+* dearmor: Operational GPG Commands.
- (line 360)
++ (line 361)
+* debug: Agent Options. (line 78)
+* debug <1>: Dirmngr Options. (line 62)
+* debug <2>: GPG Esoteric Options.
+ (line 47)
+* debug <3>: Esoteric Options. (line 54)
+* debug <4>: Scdaemon Options. (line 69)
+* debug-all: Agent Options. (line 102)
+* debug-all <1>: Dirmngr Options. (line 67)
+* debug-all <2>: GPG Esoteric Options.
+ (line 53)
+* debug-all <3>: Esoteric Options. (line 81)
+* debug-all <4>: Scdaemon Options. (line 96)
+* debug-allow-core-dump: Esoteric Options. (line 84)
+* debug-allow-core-dump <1>: Scdaemon Options. (line 113)
+* debug-assuan-log-cats: Scdaemon Options. (line 122)
+* debug-disable-ticker: Scdaemon Options. (line 109)
+* debug-ignore-expiration: Esoteric Options. (line 95)
+* debug-iolbf: GPG Esoteric Options.
+ (line 56)
+* debug-level: Agent Options. (line 53)
+* debug-level <1>: Dirmngr Options. (line 37)
+* debug-level <2>: GPG Esoteric Options.
+ (line 22)
+* debug-level <3>: Esoteric Options. (line 29)
+* debug-level <4>: Scdaemon Options. (line 40)
+* debug-log-tid: Scdaemon Options. (line 119)
+* debug-no-chain-validation: Esoteric Options. (line 91)
+* debug-pinentry: Agent Options. (line 122)
+* debug-quick-random: Agent Options. (line 110)
+* debug-wait: Agent Options. (line 105)
+* debug-wait <1>: Dirmngr Options. (line 73)
+* debug-wait <2>: Scdaemon Options. (line 99)
+* debug-wait <3>: Scdaemon Options. (line 104)
+* decode: Invoking gpg-connect-agent.
+ (line 95)
+* decrypt: Operational GPG Commands.
+ (line 52)
+* decrypt <1>: Operational GPGSM Commands.
+ (line 11)
+* decrypt <2>: gpg-zip. (line 22)
+* decrypt-files: Operational GPG Commands.
+ (line 100)
+* default-cache-ttl: Agent Options. (line 190)
+* default-cache-ttl <1>: Agent Options. (line 196)
+* default-cert-expire: GPG Esoteric Options.
+ (line 464)
+* default-cert-level: GPG Configuration Options.
+ (line 347)
+* default-key: GPG Configuration Options.
+ (line 10)
+* default-key <1>: Input and Output. (line 34)
+* default-keyserver-url: GPG Esoteric Options.
+ (line 503)
+* default-preference-list: GPG Esoteric Options.
+ (line 498)
+* default-recipient: GPG Configuration Options.
+ (line 19)
+* default-recipient-self: GPG Configuration Options.
+ (line 23)
+* default-sig-expire: GPG Esoteric Options.
+ (line 450)
+* delete-keys: Certificate Management.
+ (line 59)
+* delete-secret-and-public-key: Operational GPG Commands.
- (line 201)
++ (line 202)
+* delete-secret-keys: Operational GPG Commands.
- (line 194)
++ (line 195)
+* deny-admin: Scdaemon Options. (line 192)
+* desig-revoke: OpenPGP Key Management.
+ (line 90)
+* detach-sign: Operational GPG Commands.
+ (line 27)
+* digest-algo: GPG Esoteric Options.
+ (line 197)
+* dirmngr: Invoking gpg-connect-agent.
+ (line 54)
+* dirmngr-program: GPG Configuration Options.
- (line 717)
++ (line 699)
+* dirmngr-program <1>: Configuration Options.
+ (line 52)
+* dirmngr-program <2>: Invoking gpg-connect-agent.
+ (line 49)
+* disable-application: Scdaemon Options. (line 202)
+* disable-ccid: Scdaemon Options. (line 150)
+* disable-check-own-socket: Agent Options. (line 294)
+* disable-cipher-algo: GPG Esoteric Options.
+ (line 235)
+* disable-crl-checks: Certificate Options. (line 13)
+* disable-dsa2: GPG Configuration Options.
+ (line 185)
+* disable-http: Dirmngr Options. (line 132)
+* disable-large-rsa: GPG Configuration Options.
+ (line 176)
+* disable-ldap: Dirmngr Options. (line 129)
+* disable-mdc: OpenPGP Options. (line 30)
+* disable-ocsp: Certificate Options. (line 41)
+* disable-pinpad: Scdaemon Options. (line 189)
+* disable-policy-checks: Certificate Options. (line 8)
+* disable-pubkey-algo: GPG Esoteric Options.
+ (line 240)
+* disable-scdaemon: Agent Options. (line 288)
+* disable-signer-uid: OpenPGP Options. (line 35)
+* disable-trusted-cert-crl-check: Certificate Options. (line 19)
+* display: Agent Options. (line 312)
+* display-charset: GPG Configuration Options.
+ (line 268)
+* display-charset:iso-8859-1: GPG Configuration Options.
+ (line 277)
+* display-charset:iso-8859-15: GPG Configuration Options.
+ (line 283)
+* display-charset:iso-8859-2: GPG Configuration Options.
+ (line 280)
+* display-charset:koi8-r: GPG Configuration Options.
+ (line 286)
+* display-charset:utf-8: GPG Configuration Options.
+ (line 289)
+* dry-run: GPG Esoteric Options.
+ (line 8)
+* dump-cert: Certificate Management.
+ (line 35)
+* dump-chain: Certificate Management.
+ (line 39)
+* dump-external-keys: Certificate Management.
+ (line 46)
+* dump-keys: Certificate Management.
+ (line 35)
+* dump-options: Agent Commands. (line 19)
+* dump-options <1>: Dirmngr Commands. (line 18)
+* dump-options <2>: General GPG Commands.
+ (line 19)
+* dump-options <3>: General GPGSM Commands.
+ (line 19)
+* dump-options <4>: Scdaemon Commands. (line 18)
+* dump-secret-keys: Certificate Management.
+ (line 42)
+* edit-key: OpenPGP Key Management.
+ (line 95)
+* emit-version: GPG Esoteric Options.
+ (line 109)
+* enable-crl-checks: Certificate Options. (line 13)
+* enable-dsa2: GPG Configuration Options.
+ (line 185)
+* enable-large-rsa: GPG Configuration Options.
+ (line 176)
+* enable-ocsp: Certificate Options. (line 41)
+* enable-passphrase-history: Agent Options. (line 248)
+* enable-pinpad-varlen: Scdaemon Options. (line 181)
+* enable-policy-checks: Certificate Options. (line 8)
+* enable-progress-filter: GPG Esoteric Options.
+ (line 66)
+* enable-putty-support: Agent Options. (line 332)
+* enable-special-filenames: GPG Esoteric Options.
+ (line 485)
+* enable-ssh-support: Agent Options. (line 332)
+* enable-trusted-cert-crl-check: Certificate Options. (line 19)
+* enarmor: Operational GPG Commands.
- (line 360)
++ (line 361)
+* encrypt: Operational GPG Commands.
+ (line 31)
+* encrypt <1>: Operational GPGSM Commands.
+ (line 7)
+* encrypt <2>: gpg-zip. (line 17)
+* encrypt-files: Operational GPG Commands.
+ (line 97)
+* encrypt-to: GPG Key related Options.
+ (line 35)
+* enforce-passphrase-constraints: Agent Options. (line 214)
+* escape-from-lines: GPG Esoteric Options.
+ (line 265)
+* exec: Invoking gpg-connect-agent.
+ (line 65)
+* exec-path: GPG Configuration Options.
+ (line 209)
+* exit-on-status-write-error: GPG Configuration Options.
- (line 743)
++ (line 725)
+* expert: GPG Configuration Options.
- (line 801)
++ (line 783)
+* export: Operational GPG Commands.
- (line 207)
++ (line 208)
+* export <1>: Certificate Management.
+ (line 68)
+* export-filter: GPG Input and Output.
- (line 88)
++ (line 96)
+* export-options: GPG Input and Output.
- (line 118)
++ (line 145)
+* export-ownertrust: Operational GPG Commands.
- (line 321)
++ (line 322)
+* export-secret-key-p12: Certificate Management.
+ (line 81)
+* export-secret-key-p8: Certificate Management.
+ (line 90)
+* export-secret-key-raw: Certificate Management.
+ (line 90)
+* export-secret-keys: Operational GPG Commands.
- (line 223)
++ (line 224)
+* export-secret-subkeys: Operational GPG Commands.
- (line 223)
++ (line 224)
+* export-ssh-key: Operational GPG Commands.
- (line 245)
++ (line 246)
+* extra-digest-algo: Esoteric Options. (line 7)
+* extra-socket: Agent Options. (line 322)
+* faked-system-time: Agent Options. (line 48)
+* faked-system-time <1>: GPG Esoteric Options.
+ (line 60)
+* faked-system-time <2>: Esoteric Options. (line 18)
+* fast-list-mode: GPG Esoteric Options.
+ (line 404)
+* fetch-crl: Dirmngr Commands. (line 44)
+* fetch-keys: Operational GPG Commands.
- (line 290)
++ (line 291)
+* fingerprint: Operational GPG Commands.
+ (line 160)
+* fixed-list-mode: GPG Input and Output.
- (line 174)
++ (line 201)
+* flush: Dirmngr Commands. (line 54)
+* for-your-eyes-only: GPG Esoteric Options.
+ (line 174)
+* force: Dirmngr Options. (line 87)
+* force <1>: watchgnupg. (line 22)
+* force-crl-refresh: Certificate Options. (line 30)
+* force-default-responder: dirmngr-client. (line 64)
+* force-mdc: OpenPGP Options. (line 24)
+* forget: Invoking gpg-preset-passphrase.
+ (line 24)
+* gen-key: OpenPGP Key Management.
+ (line 63)
+* gen-key <1>: OpenPGP Key Management.
+ (line 69)
+* gen-key <2>: Certificate Management.
+ (line 7)
+* gen-prime: Operational GPG Commands.
- (line 355)
++ (line 356)
+* gen-random: Operational GPG Commands.
- (line 348)
++ (line 349)
+* gen-revoke: OpenPGP Key Management.
+ (line 77)
+* gnupg: Compliance Options. (line 12)
+* gnutls-debug: Dirmngr Options. (line 70)
+* gpg: gpg-zip. (line 50)
+* gpg-agent-info: GPG Configuration Options.
- (line 707)
++ (line 689)
+* gpg-args: gpg-zip. (line 53)
+* gpgconf-list: GPG Esoteric Options.
+ (line 519)
+* gpgconf-test: GPG Esoteric Options.
+ (line 523)
+* group: GPG Key related Options.
+ (line 55)
+* help: Agent Commands. (line 15)
+* help <1>: Dirmngr Commands. (line 14)
+* help <2>: General GPG Commands.
+ (line 12)
+* help <3>: General GPGSM Commands.
+ (line 11)
+* help <4>: Scdaemon Commands. (line 14)
+* help <5>: watchgnupg. (line 35)
+* help <6>: dirmngr-client. (line 44)
+* help <7>: gpg-zip. (line 65)
+* hex: Invoking gpg-connect-agent.
+ (line 91)
+* hidden-encrypt-to: GPG Key related Options.
+ (line 43)
+* hidden-recipient: GPG Key related Options.
+ (line 14)
+* hidden-recipient-file: GPG Key related Options.
+ (line 29)
+* homedir: Agent Options. (line 13)
+* homedir <1>: GPG Configuration Options.
+ (line 247)
+* homedir <2>: Configuration Options.
+ (line 16)
+* homedir <3>: Scdaemon Options. (line 13)
+* homedir <4>: gpgv. (line 55)
+* homedir <5>: Invoking gpg-connect-agent.
+ (line 21)
+* homedir <6>: Invoking symcryptrun.
+ (line 36)
+* honor-http-proxy: Dirmngr Options. (line 151)
+* http-proxy: Dirmngr Options. (line 155)
+* ignore-cache-for-signing: Agent Options. (line 184)
+* ignore-cert-extension: Dirmngr Options. (line 261)
+* ignore-cert-extension <1>: Certificate Options. (line 70)
+* ignore-crc-error: GPG Esoteric Options.
+ (line 355)
+* ignore-http-dp: Dirmngr Options. (line 135)
+* ignore-ldap-dp: Dirmngr Options. (line 142)
+* ignore-mdc-error: GPG Esoteric Options.
+ (line 362)
+* ignore-ocsp-service-url: Dirmngr Options. (line 147)
+* ignore-time-conflict: GPG Esoteric Options.
+ (line 341)
+* ignore-time-conflict <1>: gpgv. (line 49)
+* ignore-valid-from: GPG Esoteric Options.
+ (line 348)
+* import: Operational GPG Commands.
- (line 259)
++ (line 260)
+* import <1>: Certificate Management.
+ (line 98)
+* import-filter: GPG Input and Output.
- (line 88)
++ (line 96)
+* import-options: GPG Input and Output.
- (line 29)
++ (line 37)
+* import-ownertrust: Operational GPG Commands.
- (line 327)
++ (line 328)
+* include-certs: CMS Options. (line 7)
++* input-size-hint: GPG Input and Output.
++ (line 29)
+* interactive: GPG Esoteric Options.
+ (line 19)
+* keep-display: Agent Options. (line 317)
+* keep-tty: Agent Options. (line 317)
+* keydb-clear-some-cert-flags: Certificate Management.
+ (line 51)
+* keyedit:addcardkey: OpenPGP Key Management.
+ (line 238)
+* keyedit:addkey: OpenPGP Key Management.
+ (line 235)
+* keyedit:addphoto: OpenPGP Key Management.
+ (line 157)
+* keyedit:addrevoker: OpenPGP Key Management.
+ (line 286)
+* keyedit:adduid: OpenPGP Key Management.
+ (line 154)
+* keyedit:bkuptocard: OpenPGP Key Management.
+ (line 252)
+* keyedit:check: OpenPGP Key Management.
+ (line 150)
+* keyedit:clean: OpenPGP Key Management.
+ (line 299)
+* keyedit:cross-certify: OpenPGP Key Management.
+ (line 313)
+* keyedit:delkey: OpenPGP Key Management.
+ (line 263)
+* keyedit:delsig: OpenPGP Key Management.
+ (line 140)
+* keyedit:deluid: OpenPGP Key Management.
+ (line 167)
+* keyedit:disable: OpenPGP Key Management.
+ (line 282)
+* keyedit:enable: OpenPGP Key Management.
+ (line 282)
+* keyedit:expire: OpenPGP Key Management.
+ (line 271)
+* keyedit:key: OpenPGP Key Management.
+ (line 104)
+* keyedit:keyserver: OpenPGP Key Management.
+ (line 184)
+* keyedit:keytocard: OpenPGP Key Management.
+ (line 241)
+* keyedit:lsign: OpenPGP Key Management.
+ (line 115)
+* keyedit:minimize: OpenPGP Key Management.
+ (line 308)
+* keyedit:notation: OpenPGP Key Management.
+ (line 191)
+* keyedit:nrsign: OpenPGP Key Management.
+ (line 120)
+* keyedit:passwd: OpenPGP Key Management.
+ (line 292)
+* keyedit:pref: OpenPGP Key Management.
+ (line 199)
+* keyedit:primary: OpenPGP Key Management.
+ (line 176)
+* keyedit:quit: OpenPGP Key Management.
+ (line 324)
+* keyedit:revkey: OpenPGP Key Management.
+ (line 268)
+* keyedit:revsig: OpenPGP Key Management.
+ (line 145)
+* keyedit:revuid: OpenPGP Key Management.
+ (line 173)
+* keyedit:save: OpenPGP Key Management.
+ (line 321)
+* keyedit:setpref: OpenPGP Key Management.
+ (line 211)
+* keyedit:showphoto: OpenPGP Key Management.
+ (line 164)
+* keyedit:showpref: OpenPGP Key Management.
+ (line 203)
+* keyedit:sign: OpenPGP Key Management.
+ (line 108)
+* keyedit:toggle: OpenPGP Key Management.
+ (line 295)
+* keyedit:trust: OpenPGP Key Management.
+ (line 277)
+* keyedit:tsign: OpenPGP Key Management.
+ (line 124)
+* keyedit:uid: OpenPGP Key Management.
+ (line 100)
+* keyid-format: GPG Configuration Options.
+ (line 546)
+* keyring: GPG Configuration Options.
+ (line 216)
+* keyring <1>: gpgv. (line 36)
+* keyserver: Dirmngr Options. (line 98)
+* keyserver <1>: GPG Configuration Options.
+ (line 555)
+* keyserver-options: GPG Configuration Options.
+ (line 578)
+* kill: Invoking gpgconf. (line 62)
+* launch: Invoking gpgconf. (line 55)
+* lc-ctype: Agent Options. (line 312)
+* lc-messages: Agent Options. (line 312)
+* ldap-proxy: Dirmngr Options. (line 160)
+* ldapserverlist-file: Dirmngr Options. (line 171)
+* ldaptimeout: Dirmngr Options. (line 190)
+* learn-card: Certificate Management.
+ (line 103)
+* legacy-list-mode: GPG Input and Output.
- (line 180)
++ (line 207)
+* limit-card-insert-tries: GPG Configuration Options.
- (line 752)
++ (line 734)
+* list-archive: gpg-zip. (line 43)
+* list-chain: Certificate Management.
+ (line 31)
+* list-config: GPG Esoteric Options.
+ (line 508)
+* list-crls: Dirmngr Commands. (line 32)
+* list-gcrypt-config: GPG Esoteric Options.
+ (line 516)
+* list-keys: Operational GPG Commands.
+ (line 105)
+* list-keys <1>: Certificate Management.
+ (line 16)
+* list-keys <2>: Certificate Management.
+ (line 27)
+* list-only: GPG Esoteric Options.
+ (line 11)
+* list-options: GPG Configuration Options.
+ (line 63)
+* list-options:show-keyring: GPG Configuration Options.
+ (line 112)
+* list-options:show-keyserver-urls: GPG Configuration Options.
+ (line 96)
+* list-options:show-notations: GPG Configuration Options.
+ (line 91)
+* list-options:show-photos: GPG Configuration Options.
+ (line 71)
+* list-options:show-policy-urls: GPG Configuration Options.
+ (line 85)
+* list-options:show-sig-expire: GPG Configuration Options.
+ (line 116)
+* list-options:show-sig-subpackets: GPG Configuration Options.
+ (line 120)
+* list-options:show-std-notations: GPG Configuration Options.
+ (line 91)
+* list-options:show-uid-validity: GPG Configuration Options.
+ (line 100)
+* list-options:show-unusable-subkeys: GPG Configuration Options.
+ (line 108)
+* list-options:show-unusable-uids: GPG Configuration Options.
+ (line 104)
+* list-options:show-usage: GPG Configuration Options.
+ (line 79)
+* list-options:show-user-notations: GPG Configuration Options.
+ (line 91)
+* list-packets: Operational GPG Commands.
+ (line 169)
+* list-secret-keys: Operational GPG Commands.
+ (line 116)
+* list-secret-keys <1>: Certificate Management.
+ (line 23)
+* list-sigs: Operational GPG Commands.
+ (line 122)
+* load-crl: Dirmngr Commands. (line 36)
+* load-crl <1>: dirmngr-client. (line 80)
+* local-user: GPG Key related Options.
+ (line 77)
+* local-user <1>: Input and Output. (line 41)
+* local-user <2>: gpg-zip. (line 40)
+* locate-keys: Operational GPG Commands.
+ (line 153)
+* lock-multiple: GPG Configuration Options.
- (line 732)
++ (line 714)
+* lock-never: GPG Configuration Options.
- (line 736)
++ (line 718)
+* lock-once: GPG Configuration Options.
- (line 728)
++ (line 710)
+* log-file: Agent Options. (line 144)
+* log-file <1>: Dirmngr Options. (line 33)
+* log-file <2>: GPG Esoteric Options.
+ (line 83)
+* log-file <3>: Configuration Options.
+ (line 76)
+* log-file <4>: Scdaemon Options. (line 135)
+* log-file <5>: Invoking symcryptrun.
+ (line 57)
+* logger-fd: GPG Esoteric Options.
+ (line 79)
+* logger-fd <1>: gpgv. (line 46)
+* lookup: dirmngr-client. (line 86)
+* lsign-key: OpenPGP Key Management.
+ (line 359)
+* mangle-dos-filenames: GPG Configuration Options.
+ (line 331)
+* marginals-needed: GPG Configuration Options.
+ (line 658)
+* max-cache-ttl: Agent Options. (line 202)
+* max-cache-ttl-ssh: Agent Options. (line 208)
+* max-cert-depth: GPG Configuration Options.
- (line 684)
++ (line 666)
+* max-output: GPG Input and Output.
+ (line 19)
+* max-passphrase-days: Agent Options. (line 243)
+* max-replies: Dirmngr Options. (line 258)
+* min-cert-level: GPG Configuration Options.
+ (line 376)
+* min-passphrase-len: Agent Options. (line 218)
+* min-passphrase-nonalpha: Agent Options. (line 223)
+* multi-server: Scdaemon Commands. (line 26)
+* multifile: Operational GPG Commands.
+ (line 86)
+* nameserver: Dirmngr Options. (line 121)
+* no: GPG Configuration Options.
+ (line 60)
+* no-allow-external-cache: Agent Options. (line 169)
+* no-allow-loopback-pinentry: Agent Options. (line 161)
+* no-allow-mark-trusted: Agent Options. (line 151)
+* no-armor: GPG Input and Output.
+ (line 12)
+* no-auto-key-retrieve: GPG Configuration Options.
+ (line 529)
+* no-autostart: GPG Configuration Options.
- (line 721)
++ (line 703)
+* no-autostart <1>: Configuration Options.
+ (line 65)
+* no-autostart <2>: Invoking gpg-connect-agent.
+ (line 77)
+* no-batch: GPG Configuration Options.
+ (line 43)
+* no-common-certs-import: Esoteric Options. (line 124)
+* no-default-keyring: GPG Esoteric Options.
+ (line 386)
+* no-default-recipient: GPG Configuration Options.
+ (line 29)
+* no-detach: Agent Options. (line 127)
+* no-detach <1>: Scdaemon Options. (line 131)
+* no-encrypt-to: GPG Key related Options.
+ (line 51)
+* no-expensive-trust-checks: GPG Esoteric Options.
+ (line 490)
+* no-ext-connect: Invoking gpg-connect-agent.
+ (line 72)
+* no-grab: Agent Options. (line 140)
+* no-greeting: GPG Configuration Options.
- (line 766)
++ (line 748)
+* no-groups: GPG Key related Options.
+ (line 73)
+* no-keyring: GPG Esoteric Options.
+ (line 393)
+* no-literal: GPG Esoteric Options.
+ (line 412)
+* no-mangle-dos-filenames: GPG Configuration Options.
+ (line 331)
+* no-mdc-warning: GPG Configuration Options.
- (line 785)
++ (line 767)
+* no-options: GPG Configuration Options.
+ (line 306)
+* no-random-seed-file: GPG Configuration Options.
- (line 760)
++ (line 742)
+* no-secmem-warning: GPG Configuration Options.
- (line 769)
++ (line 751)
+* no-secmem-warning <1>: Configuration Options.
+ (line 72)
+* no-sig-cache: GPG Configuration Options.
- (line 687)
++ (line 669)
+* no-skip-hidden-recipients: GPG Key related Options.
- (line 100)
++ (line 108)
+* no-tty: GPG Configuration Options.
+ (line 52)
+* no-use-standard-socket: Agent Options. (line 302)
+* no-verbose: GPG Configuration Options.
+ (line 36)
+* not-dash-escaped: GPG Esoteric Options.
+ (line 255)
+* ocsp: dirmngr-client. (line 61)
+* ocsp-current-period: Dirmngr Options. (line 253)
+* ocsp-max-clock-skew: Dirmngr Options. (line 245)
+* ocsp-max-period: Dirmngr Options. (line 249)
+* ocsp-responder: Dirmngr Options. (line 219)
+* ocsp-signer: Dirmngr Options. (line 224)
+* only-ldap-proxy: Dirmngr Options. (line 166)
+* openpgp: Compliance Options. (line 19)
+* options: Agent Options. (line 7)
+* options <1>: Dirmngr Options. (line 7)
+* options <2>: Dirmngr Options. (line 12)
+* options <3>: GPG Configuration Options.
+ (line 301)
+* options <4>: Configuration Options.
+ (line 10)
+* options <5>: Scdaemon Options. (line 7)
+* output: GPG Input and Output.
+ (line 16)
+* output <1>: Input and Output. (line 51)
+* output <2>: gpg-zip. (line 47)
+* override-session-key: GPG Esoteric Options.
+ (line 435)
+* p12-charset: Input and Output. (line 24)
+* passphrase: GPG Esoteric Options.
+ (line 295)
+* passphrase <1>: Invoking gpg-preset-passphrase.
+ (line 34)
+* passphrase-fd: GPG Esoteric Options.
+ (line 277)
+* passphrase-fd <1>: Esoteric Options. (line 100)
+* passphrase-file: GPG Esoteric Options.
+ (line 286)
+* passphrase-repeat: GPG Esoteric Options.
+ (line 272)
+* passwd: OpenPGP Key Management.
+ (line 399)
+* passwd <1>: Certificate Management.
+ (line 108)
+* pcsc-driver: Scdaemon Options. (line 139)
+* pem: dirmngr-client. (line 58)
+* permission-warning: GPG Configuration Options.
- (line 772)
++ (line 754)
+* personal-cipher-preferences: OpenPGP Options. (line 42)
+* personal-compress-preferences: OpenPGP Options. (line 60)
+* personal-digest-preferences: OpenPGP Options. (line 51)
+* pgp6: Compliance Options. (line 41)
+* pgp7: Compliance Options. (line 51)
+* pgp8: Compliance Options. (line 57)
+* photo-viewer: GPG Configuration Options.
+ (line 191)
+* pinentry-invisible-char: Agent Options. (line 251)
+* pinentry-mode: GPG Esoteric Options.
+ (line 303)
+* pinentry-mode <1>: Esoteric Options. (line 109)
+* pinentry-program: Agent Options. (line 262)
+* pinentry-timeout: Agent Options. (line 256)
+* pinentry-touch-file: Agent Options. (line 275)
+* ping: dirmngr-client. (line 69)
+* policy-file: Configuration Options.
+ (line 43)
+* prefer-system-dirmngr: Configuration Options.
+ (line 56)
+* preserve-permissions: GPG Esoteric Options.
+ (line 493)
+* preset: Invoking gpg-preset-passphrase.
+ (line 20)
+* primary-keyring: GPG Configuration Options.
+ (line 235)
+* print-md: Operational GPG Commands.
- (line 343)
++ (line 344)
+* q: Invoking gpg-connect-agent.
+ (line 18)
+* q <1>: Invoking symcryptrun.
+ (line 33)
+* quick-addkey: OpenPGP Key Management.
+ (line 35)
+* quick-adduid: OpenPGP Key Management.
+ (line 384)
+* quick-gen-key: OpenPGP Key Management.
+ (line 9)
+* quick-lsign-key: OpenPGP Key Management.
+ (line 365)
+* quick-revuid: OpenPGP Key Management.
+ (line 391)
+* quick-sign-key: OpenPGP Key Management.
+ (line 365)
+* quiet: Agent Options. (line 41)
+* quiet <1>: GPG Configuration Options.
+ (line 39)
+* quiet <2>: gpgv. (line 33)
+* quiet <3>: Invoking gpgconf. (line 89)
+* quiet <4>: Invoking gpg-connect-agent.
+ (line 18)
+* quiet <5>: dirmngr-client. (line 48)
+* quiet <6>: Invoking symcryptrun.
+ (line 33)
+* raw-socket: Invoking gpg-connect-agent.
+ (line 59)
+* reader-port: Scdaemon Options. (line 156)
+* rebuild-keydb-caches: Operational GPG Commands.
- (line 337)
++ (line 338)
+* recipient: GPG Key related Options.
+ (line 8)
+* recipient <1>: Input and Output. (line 46)
+* recipient <2>: gpg-zip. (line 36)
+* recipient-file: GPG Key related Options.
+ (line 22)
+* recv-keys: Operational GPG Commands.
- (line 268)
++ (line 269)
+* refresh-keys: Operational GPG Commands.
- (line 272)
++ (line 273)
+* reload: Invoking gpgconf. (line 50)
+* remove-socketdir: Invoking gpgconf. (line 74)
+* require-cross-certification: GPG Configuration Options.
- (line 794)
++ (line 776)
+* require-secmem: GPG Configuration Options.
- (line 789)
++ (line 771)
+* rfc2440: Compliance Options. (line 37)
+* rfc4880: Compliance Options. (line 25)
+* rfc4880bis: Compliance Options. (line 30)
+* run: Invoking gpg-connect-agent.
+ (line 82)
+* s: Dirmngr Options. (line 81)
+* s2k-cipher-algo: OpenPGP Options. (line 70)
+* s2k-count: OpenPGP Options. (line 86)
+* s2k-digest-algo: OpenPGP Options. (line 75)
+* s2k-mode: OpenPGP Options. (line 79)
+* scdaemon-program: Agent Options. (line 284)
+* search-keys: Operational GPG Commands.
- (line 281)
++ (line 282)
+* secret-keyring: GPG Configuration Options.
+ (line 230)
+* send-keys: Operational GPG Commands.
- (line 214)
++ (line 215)
++* sender: GPG Key related Options.
++ (line 81)
+* server: Agent Commands. (line 23)
+* server <1>: Dirmngr Commands. (line 22)
+* server <2>: Operational GPGSM Commands.
+ (line 24)
+* server <3>: Scdaemon Commands. (line 22)
+* set-filename: GPG Esoteric Options.
+ (line 167)
+* set-filesize: GPG Esoteric Options.
+ (line 416)
+* set-notation: GPG Esoteric Options.
+ (line 119)
+* set-policy-url: GPG Esoteric Options.
+ (line 149)
+* sh: Agent Options. (line 134)
+* sh <1>: Dirmngr Options. (line 81)
+* show-keyring: Deprecated Options. (line 16)
+* show-notation: Deprecated Options. (line 25)
+* show-photos: Deprecated Options. (line 8)
+* show-policy-url: Deprecated Options. (line 33)
+* show-session-key: GPG Esoteric Options.
+ (line 420)
+* shutdown: Dirmngr Commands. (line 50)
+* sig-keyserver-url: GPG Esoteric Options.
+ (line 159)
+* sig-notation: GPG Esoteric Options.
+ (line 119)
+* sig-policy-url: GPG Esoteric Options.
+ (line 149)
+* sign: Operational GPG Commands.
+ (line 8)
+* sign <1>: Operational GPGSM Commands.
+ (line 16)
+* sign-key: OpenPGP Key Management.
+ (line 355)
+* skip-hidden-recipients: GPG Key related Options.
- (line 100)
++ (line 108)
+* skip-verify: GPG Esoteric Options.
+ (line 396)
+* squid-mode: dirmngr-client. (line 101)
+* status-fd: GPG Esoteric Options.
+ (line 71)
+* status-fd <1>: gpgv. (line 42)
+* status-file: GPG Esoteric Options.
+ (line 75)
+* store: Operational GPG Commands.
+ (line 48)
+* subst: Invoking gpg-connect-agent.
+ (line 88)
+* symmetric: Operational GPG Commands.
+ (line 39)
+* tar: gpg-zip. (line 56)
+* tar-args: gpg-zip. (line 59)
+* textmode: OpenPGP Options. (line 8)
+* throw-keyids: GPG Esoteric Options.
+ (line 246)
+* tofu-default-policy: GPG Configuration Options.
+ (line 662)
- * tofu-default-policy <1>: GPG Configuration Options.
- (line 666)
+* tofu-policy: Operational GPG Commands.
- (line 365)
++ (line 366)
+* trust-mode:always: GPG Configuration Options.
+ (line 462)
+* trust-mode:auto: GPG Configuration Options.
+ (line 471)
+* trust-mode:classic: GPG Configuration Options.
+ (line 397)
+* trust-mode:direct: GPG Configuration Options.
+ (line 458)
+* trust-mode:pgp: GPG Configuration Options.
+ (line 392)
+* trust-mode:tofu: GPG Configuration Options.
+ (line 400)
+* trust-mode:tofu+pgp: GPG Configuration Options.
+ (line 446)
+* trust-model: GPG Configuration Options.
+ (line 389)
+* trustdb-name: GPG Configuration Options.
+ (line 240)
+* trusted-key: GPG Configuration Options.
+ (line 382)
+* try-all-secrets: GPG Key related Options.
- (line 92)
++ (line 100)
+* try-secret-key: GPG Key related Options.
- (line 81)
++ (line 89)
+* ttyname: Agent Options. (line 312)
+* ttytype: Agent Options. (line 312)
+* ungroup: GPG Key related Options.
+ (line 70)
+* update-trustdb: Operational GPG Commands.
- (line 296)
++ (line 297)
+* url: dirmngr-client. (line 94)
+* url <1>: dirmngr-client. (line 98)
+* use-agent: GPG Configuration Options.
- (line 704)
++ (line 686)
+* use-embedded-filename: GPG Esoteric Options.
+ (line 183)
+* use-standard-socket: Agent Options. (line 302)
+* use-standard-socket-p: Agent Options. (line 302)
+* use-tor: Dirmngr Options. (line 91)
+* utf8-strings: GPG Configuration Options.
+ (line 294)
+* v: Dirmngr Options. (line 28)
+* v <1>: Configuration Options.
+ (line 38)
+* v <2>: Scdaemon Options. (line 35)
+* v <3>: dirmngr-client. (line 53)
+* validate: dirmngr-client. (line 76)
+* validation-model: Certificate Options. (line 61)
+* verbose: Agent Options. (line 35)
+* verbose <1>: Dirmngr Options. (line 28)
+* verbose <2>: GPG Configuration Options.
+ (line 32)
+* verbose <3>: Configuration Options.
+ (line 38)
+* verbose <4>: Scdaemon Options. (line 35)
+* verbose <5>: watchgnupg. (line 29)
+* verbose <6>: gpgv. (line 28)
+* verbose <7>: Invoking gpg-preset-passphrase.
+ (line 30)
+* verbose <8>: Invoking gpg-connect-agent.
+ (line 14)
+* verbose <9>: dirmngr-client. (line 53)
+* verbose <10>: Invoking symcryptrun.
+ (line 29)
+* verify: Operational GPG Commands.
+ (line 60)
+* verify <1>: Operational GPGSM Commands.
+ (line 20)
+* verify-files: Operational GPG Commands.
+ (line 94)
+* verify-options: GPG Configuration Options.
+ (line 127)
+* verify-options:pka-lookups: GPG Configuration Options.
+ (line 163)
+* verify-options:pka-trust-increase: GPG Configuration Options.
+ (line 170)
+* verify-options:show-keyserver-urls: GPG Configuration Options.
+ (line 146)
+* verify-options:show-notations: GPG Configuration Options.
+ (line 142)
+* verify-options:show-photos: GPG Configuration Options.
+ (line 132)
+* verify-options:show-policy-urls: GPG Configuration Options.
+ (line 136)
+* verify-options:show-primary-uid-only: GPG Configuration Options.
+ (line 158)
+* verify-options:show-std-notations: GPG Configuration Options.
+ (line 142)
+* verify-options:show-uid-validity: GPG Configuration Options.
+ (line 150)
+* verify-options:show-unusable-uids: GPG Configuration Options.
+ (line 154)
+* verify-options:show-user-notations: GPG Configuration Options.
+ (line 142)
+* version: Agent Commands. (line 10)
+* version <1>: Dirmngr Commands. (line 10)
+* version <2>: General GPG Commands.
+ (line 7)
+* version <3>: General GPGSM Commands.
+ (line 7)
+* version <4>: Scdaemon Commands. (line 10)
+* version <5>: watchgnupg. (line 32)
+* version <6>: dirmngr-client. (line 40)
+* version <7>: gpg-zip. (line 62)
+* warranty: General GPG Commands.
+ (line 16)
+* warranty <1>: General GPGSM Commands.
+ (line 15)
+* weak-digest: GPG Esoteric Options.
+ (line 378)
+* weak-digest <1>: gpgv. (line 76)
+* with-colons: GPG Input and Output.
- (line 166)
++ (line 193)
+* with-ephemeral-keys: Esoteric Options. (line 24)
+* with-fingerprint: GPG Input and Output.
- (line 186)
++ (line 213)
+* with-icao-spelling: GPG Input and Output.
- (line 197)
++ (line 224)
+* with-key-data: GPG Esoteric Options.
+ (line 400)
+* with-key-data <1>: Input and Output. (line 54)
+* with-keygrip: GPG Input and Output.
- (line 201)
++ (line 228)
+* with-secret: GPG Input and Output.
- (line 209)
++ (line 237)
+* with-secret <1>: Input and Output. (line 78)
+* with-subkey-fingerprint: GPG Input and Output.
- (line 190)
++ (line 217)
+* with-validation: Input and Output. (line 60)
+* with-wkd-hash: GPG Input and Output.
- (line 204)
++ (line 232)
+* xauthority: Agent Options. (line 312)
+* yes: GPG Configuration Options.
+ (line 57)
+
+
+File: gnupg.info, Node: Environment Index, Next: Index, Prev: Option Index, Up: Top
+
+Environment Variable and File Index
+***********************************
+
+
+* Menu:
+
+* .gpg-v21-migrated: GPG Configuration. (line 52)
+* ~/.gnupg: GPG Configuration. (line 27)
+* ASSUAN_DEBUG: Scdaemon Options. (line 122)
+* COLUMNS: GPG Configuration. (line 96)
+* com-certs.pem: GPGSM Configuration. (line 84)
+* DISPLAY: GPGSM OPTION. (line 21)
+* GNUPGHOME: Agent Options. (line 13)
+* GNUPGHOME <1>: GPG Configuration Options.
+ (line 247)
+* GNUPGHOME <2>: GPG Configuration. (line 84)
+* GNUPGHOME <3>: Configuration Options.
+ (line 16)
+* GNUPGHOME <4>: Scdaemon Options. (line 13)
+* GNUPGHOME <5>: gpgv. (line 55)
+* GNUPGHOME <6>: Invoking gpg-connect-agent.
+ (line 21)
+* GNUPGHOME <7>: Invoking symcryptrun.
+ (line 36)
+* gpg-agent.conf: Agent Configuration. (line 11)
+* gpg.conf: GPG Configuration. (line 11)
+* gpgconf.ctl: Agent Options. (line 24)
+* gpgconf.ctl <1>: GPG Configuration Options.
+ (line 258)
+* gpgconf.ctl <2>: Configuration Options.
+ (line 27)
+* gpgconf.ctl <3>: Scdaemon Options. (line 24)
+* gpgconf.ctl <4>: gpgv. (line 66)
+* gpgconf.ctl <5>: Invoking gpg-connect-agent.
+ (line 32)
+* gpgconf.ctl <6>: Invoking symcryptrun.
+ (line 47)
+* gpgsm.conf: GPGSM Configuration. (line 11)
+* GPG_TTY: Invoking GPG-AGENT. (line 17)
+* GPG_TTY <1>: GPGSM OPTION. (line 23)
+* help.txt: GPGSM Configuration. (line 72)
+* HKCU\Software\GNU\GnuPG:DefaultLogFile: Agent Options. (line 144)
+* HKCU\Software\GNU\GnuPG:HomeDir: Agent Options. (line 13)
+* HKCU\Software\GNU\GnuPG:HomeDir <1>: GPG Configuration Options.
+ (line 247)
+* HKCU\Software\GNU\GnuPG:HomeDir <2>: Configuration Options.
+ (line 16)
+* HKCU\Software\GNU\GnuPG:HomeDir <3>: Scdaemon Options. (line 13)
+* HKCU\Software\GNU\GnuPG:HomeDir <4>: gpgv. (line 55)
+* HKCU\Software\GNU\GnuPG:HomeDir <5>: Invoking gpg-connect-agent.
+ (line 21)
+* HKCU\Software\GNU\GnuPG:HomeDir <6>: Invoking symcryptrun.
+ (line 36)
+* HOME: GPG Configuration. (line 81)
+* http_proxy: Dirmngr Options. (line 155)
+* LANGUAGE: GPG Configuration. (line 99)
+* LC_CTYPE: GPGSM OPTION. (line 27)
+* LC_MESSAGES: GPGSM OPTION. (line 29)
+* LINES: GPG Configuration. (line 96)
+* openpgp-revocs.d: GPG Configuration. (line 66)
+* options.skel: GPG Configuration. (line 76)
+* PATH: GPG Configuration Options.
+ (line 209)
+* PINENTRY_USER_DATA: GPG Configuration. (line 91)
+* PINENTRY_USER_DATA <1>: GPGSM OPTION. (line 33)
+* policies.txt: GPGSM Configuration. (line 18)
+* private-keys-v1.d: Agent Configuration. (line 105)
+* pubring.gpg: GPG Configuration. (line 32)
+* pubring.kbx: GPG Configuration. (line 38)
+* pubring.kbx <1>: GPGSM Configuration. (line 100)
+* qualified.txt: GPGSM Configuration. (line 33)
+* random_seed: GPG Configuration. (line 63)
+* random_seed <1>: GPGSM Configuration. (line 106)
+* S.gpg-agent: GPGSM Configuration. (line 111)
+* secring.gpg: GPG Configuration. (line 45)
+* SHELL: Agent Options. (line 134)
+* sshcontrol: Agent Configuration. (line 75)
+* TERM: GPGSM OPTION. (line 25)
+* trustdb.gpg: GPG Configuration. (line 55)
+* trustlist.txt: Agent Configuration. (line 20)
+* XAUTHORITY: GPGSM OPTION. (line 31)
+
+
+File: gnupg.info, Node: Index, Prev: Environment Index, Up: Top
+
+Index
+*****
+
+
+* Menu:
+
+* command options: Invoking GPG-AGENT. (line 6)
+* command options <1>: Invoking DIRMNGR. (line 6)
+* command options <2>: Invoking GPG. (line 6)
+* command options <3>: Invoking GPGSM. (line 6)
+* command options <4>: Invoking SCDAEMON. (line 6)
+* contributors: Contributors. (line 6)
+* DIRMNGR command options: Invoking DIRMNGR. (line 6)
+* GPG command options: Invoking GPG. (line 6)
+* GPG-AGENT command options: Invoking GPG-AGENT. (line 6)
+* gpgconf.conf: Files used by gpgconf.
+ (line 7)
+* GPGSM command options: Invoking GPGSM. (line 6)
+* options, DIRMNGR command: Invoking DIRMNGR. (line 6)
+* options, GPG command: Invoking GPG. (line 6)
+* options, GPG-AGENT command: Invoking GPG-AGENT. (line 6)
+* options, GPGSM command: Invoking GPGSM. (line 6)
+* options, SCDAEMON command: Invoking SCDAEMON. (line 6)
+* relax: Agent Configuration. (line 63)
+* scd-event: Scdaemon Configuration.
+ (line 18)
+* SCDAEMON command options: Invoking SCDAEMON. (line 6)
+* scdaemon.conf: Scdaemon Configuration.
+ (line 11)
+* SIGHUP: Agent Signals. (line 12)
+* SIGHUP <1>: Dirmngr Signals. (line 12)
+* SIGINT: Agent Signals. (line 31)
+* SIGINT <1>: Dirmngr Signals. (line 26)
+* SIGTERM: Agent Signals. (line 26)
+* SIGTERM <1>: Dirmngr Signals. (line 19)
+* SIGUSR1: Agent Signals. (line 34)
+* SIGUSR1 <1>: Dirmngr Signals. (line 29)
+* SIGUSR2: Agent Signals. (line 37)
+
diff --cc po/ca.po
index 8fa8679,51f5650..8d22f5f
--- a/po/ca.po
+++ b/po/ca.po
@@@ -27,7 -27,6 +27,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.4.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2005-02-04 02:04+0100\n"
"Last-Translator: Jordi Mallach <jordi at gnu.org>\n"
"Language-Team: Catalan <ca at dodds.net>\n"
@@@ -120,14 -104,10 +120,14 @@@ msgstr "Introduïu la contrasenya; aque
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
#, fuzzy
msgid "Passphrase:"
msgstr "la contrasenya és errònia"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr ""
@@@ -172,100 -144,72 +172,100 @@@ msgstr "l'MPI és erroni
msgid "Bad Passphrase"
msgstr "la contrasenya és errònia"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "l'algoritme de protecció %d%s no està suportat\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, 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:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
msgstr "no s'ha pogut obrir «%s»: %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, fuzzy, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr ""
"no s'ha trobat cap anell secret de escrivible: %s\n"
"\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, fuzzy, c-format
msgid "shadowing the key failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, fuzzy, c-format
msgid "error writing key: %s\n"
msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "canvia la contrasenya"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
"%s%%0Awithin gpg-agent's key storage"
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
@@@ -407,8 -325,6 +407,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "canvia la contrasenya"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -418,116 -334,86 +418,116 @@@ msgstr "
"Opcions:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr ""
# Un dels dos és en la llista d'opcions amb --help. Urgh. jm
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detall"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "una mica més silenciós"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "cerca claus en un servidor de claus"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualitza la base de dades de confiança"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, 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:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "error en la creació de la contrasenya: %s\n"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
#, fuzzy
msgid "allow presetting passphrase"
msgstr "error en la creació de la contrasenya: %s\n"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
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:230
++#: agent/gpg-agent.c:229
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
@@@ -536,7 -422,6 +536,7 @@@ msgstr "no és suportat
# Gènere? Nombre? ivb
# Werner FIXME: please add translator comment saying *what* is
# uncompressed so we know the gender. jm
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -545,134 -430,92 +545,126 @@@ 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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs at gnu.org>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
#, 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:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr ""
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "fitxer d'opcions «%s»: %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, 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:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, fuzzy, c-format
msgid "socket name '%s' is too long\n"
msgstr "Certificat de revocació vàlid"
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
#, 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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "error en crear «%s»: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, 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:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, 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:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: s'ha creat el directori\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, 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:1958
++#: agent/gpg-agent.c:1957
#, 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:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
@@@ -687,28 -528,22 +679,28 @@@ msgstr "
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2390
++#: agent/gpg-agent.c:2392
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, 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:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu claus es descarta\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent no està disponible en aquesta sessió\n"
@@@ -724,8 -557,6 +716,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -733,9 -564,6 +725,9 @@@ msgstr "
"@Ordres:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -756,40 -582,33 +748,40 @@@ msgid "
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
#, fuzzy
msgid "cancelled\n"
msgstr "Cancel·la"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, fuzzy, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
@@@ -961,42 -751,30 +953,42 @@@ msgstr "l'algoritme de protecció %d%s
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "l'algoritme de protecció %d%s no està suportat\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "error en la lectura de «%s»: %s\n"
@@@ -1011,38 -787,16 +1003,19 @@@ msgstr "s'ha produït un error mentre s
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "no s'ha pogut connectar amb «%s»: %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "hi ha un problema de comunicació amb el gpg-agent\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
#, fuzzy
msgid "problem setting the gpg-agent options\n"
msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- #, fuzzy
- msgid "canceled by user\n"
- msgstr "s'ha cancel·lat per l'usuari\n"
-
- #: common/simple-pwquery.c:579
- #, fuzzy
- msgid "problem with the agent\n"
- msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
-
# bolcats de memòria? ivb
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "no s'han pogut desactivar els bolcats de memòria: %s\n"
@@@ -1130,7 -867,6 +1103,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "AVÍS: %s és una opció desaconsellada.\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1156,17 -888,14 +1129,17 @@@ msgstr "
msgid "connection to agent is in restricted mode\n"
msgstr "no es pot fet això en mode desatès\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr ""
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1481,7 -1150,6 +1454,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:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
#, fuzzy
msgid "out of core\n"
msgstr "no forçat"
@@@ -1540,7 -1197,10 +1513,13 @@@ 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:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr ""
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "armadura: %s\n"
@@@ -1799,10 -1404,6 +1778,10 @@@ msgstr "no hi ha cap clau pública corr
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
@@@ -2100,27 -1636,18 +2079,27 @@@ msgstr "
msgid "Invalid command (try \"help\")\n"
msgstr "L'ordre no és vàlida (proveu «help»)\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output no funciona per a aquesta ordre\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "no s'ha pogut obrir «%s»\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, 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:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
@@@ -2184,46 -1699,38 +2163,46 @@@ msgstr "hi ha una clau secreta per a l
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "utilitzeu l'opció «--delete-secret-keys» per a eliminar-la primer.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "no es pot usar un paquet asimètric ESK al estar en mode S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, fuzzy, c-format
msgid "using cipher %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "«%s» ja està comprimida\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "AVÍS: «%s» és un fitxer buit\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "s'està llegint des de «%s»\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2232,18 -1739,15 +2211,18 @@@ msgstr "
"forçar l'algoritme de compressió %s (%d) viola les preferències del "
"destinatari\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s xifrat per a: «%s»\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "no podeu usar %s mentre esteu en mode %s\n"
@@@ -2361,8 -1844,6 +2340,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: es descarta: %s\n"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2401,8 -1875,6 +2380,8 @@@ msgstr "error en crear «%s»: %s\n
msgid "[User ID not found]"
msgstr "[No s'ha trobat l'id d'usuari]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opcions d'importació no vàlides\n"
@@@ -2472,220 -1931,171 +2451,220 @@@ msgstr "
msgid "using subkey %s instead of primary key %s\n"
msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "|[fitxer]|crea una signatura"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
#, fuzzy
msgid "make a clear text signature"
msgstr "|[fitxer]|crea una signatura en text clar"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "crea una signatura separada"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "xifra dades"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "xifra només amb xifratge simètric"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "desxifra dades (predeterminat)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verifica una signatura"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "llista claus"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "llista claus i signatures"
# «de les claus» o «de la clau»? ivb
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "list and check key signatures"
msgstr "comprova les signatures de la claus"
# «dactilars» o «digitals»? ivb
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "llista claus i empremtes digitals"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "llista claus secretes"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "genera un nou parell de claus"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genera un nou parell de claus"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genera un nou parell de claus"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "genera un nou parell de claus"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "genera un certificat de revocació"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "elimina claus de l'anell públic"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "elimina claus de l'anell secret"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "signa una clau"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "signa una clau localment"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "signa una clau"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "signa una clau localment"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "signa o edita una clau"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "canvia la contrasenya"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "exporta claus"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "exporta claus a un servidor de claus"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "importa claus d'un servidor de claus"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "cerca claus en un servidor de claus"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "actualitza totes les claus des d'un servidor de claus"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "importa/fon claus"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "actualitza la base de dades de confiança"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
#, fuzzy
msgid "print message digests"
msgstr "|algo [fitxers]|imprimeix resums de missatges"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "crea eixida amb armadura ascii"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOM|xifra per a NOM"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "usa aquest id per a signar o desxifrar"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|nivell de compressió N (0 no comprimeix)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "usa el mode de text canònic"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "no fa cap canvi"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "pregunta abans de sobreescriure"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2696,7 -2106,6 +2675,7 @@@ msgstr "
# Crec q (A)lice (orig.), (B)ob (dest.), etc. són noms usats pel Zimmerman
# en el manual original de PGP. A, B, C... ivb
# En efecte. Idem per a Mallory més endavant. Els deixe com a l'original. jm
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2716,13 -2125,11 +2695,13 @@@ msgstr "
" --list-keys [noms] mostra claus\n"
" --fingerprint [noms] mostra empremtes digitals\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2742,7 -2149,6 +2721,7 @@@ msgstr "
# Precissament acabem de parlar d'«implementat a la llista del GNOME
# i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
# encara no m'agraden massa... jm
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2750,613 -2156,479 +2729,608 @@@ msgstr "
"\n"
"Algoritmes suportats:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "Clau pública: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Xifratge: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Dispersió: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Compressió: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "forma d'ús: gpg [opcions] "
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "les ordres entren en conflicte\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, fuzzy, c-format
#| msgid "no = sign found in group definition `%s'\n"
msgid "no = sign found in group definition '%s'\n"
msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
# Indi. ivb
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
# Indi. ivb
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
# Indi. ivb
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
#, fuzzy
msgid "show key usage information during key listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
#, fuzzy
msgid "show all notations during signature listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "la URL de política de signatura donada no és vàlida\n"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostra en quin anell de claus està una clau llistada"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "desactiva una clau"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "el destinatari predeterminat és desconegut «%s»\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, fuzzy, c-format
#| msgid "NOTE: old default options file `%s' ignored\n"
msgid "Note: old default options file '%s' ignored\n"
msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr ""
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "NOTA: %s no és per a ús normal!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s no és un joc de caràcters vàlid\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "No és una adreça vàlida\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "l'algoritme de dispersió és invàlid «%s»\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s no és un joc de caràcters vàlid\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opcions d'importanció no vàlides\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opcions d'importanció no vàlides\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
#, fuzzy
msgid "invalid list options\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "la URL de política de signatura donada no és vàlida\n"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
#, fuzzy
msgid "invalid verify options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "no s'ha pogut fixar l'exec-path a %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "AVÍS: el programa podria crear un fitxer core!\n"
# FIXME: preferència? jm
# Ho discutírem en la llista, segur. Deu ser als arxius. ivb
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVÍS: %s té preferència sobre %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s no és permés amb %s!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s no té sentit amb %s!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "l'algorisme de resum seleccionat no és vàlid\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ha de ser major que 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ha de ser major que 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "les preferències per defecte són invàlides\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "les preferències personals de xifrat són invàlides\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "les preferències personals de digest són invàlides\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "les preferències personals de compressió són invàlides\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s encara no funciona amb %s\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, fuzzy, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, fuzzy, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, fuzzy, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "no podeu usar l'algorisme de compressió %s mentre esteu en mode %s\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"AVÍS: s'han donat destinataris (-r) sense usar xifratge de clau pública\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [nom_del_fitxer]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [nom_del_fitxer]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "ha fallat el desxifratge: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "no podeu usar %s mentre esteu en mode %s\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [nom_del_fitxer]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "no podeu usar %s mentre esteu en mode %s\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nom_del_fitxer]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [nom_del_fitxer]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [nom_del_fitxer]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [ordres]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "l'enviament al servidor de claus ha fallat: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "la recepció des del servidor de claus ha fallat: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "l'exportació de la clau ha fallat: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "l'exportació de la clau ha fallat: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ha fallat la cerca al servidor de claus: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "ha fallat el refresc des del servidor de claus: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "no s'ha pogut llevar l'armadura: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "l'algoritme de dispersió és invàlid «%s»\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[nom_del_fitxer]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Endavant, escriviu el missatge...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "la URL de política de certificació donada no és vàlida\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "la URL de política de signatura donada no és vàlida\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL de política de signatura donada no és vàlida\n"
@@@ -3402,328 -2666,262 +3376,328 @@@ msgstr "No hi ha ajuda disponible
msgid "No help available for '%s'"
msgstr "No hi ha ajuda disponible per a `%s'"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "actualitza la base de dades de confiança"
- #: g10/import.c:143
++#: g10/import.c:147
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "actualitza la base de dades de confiança"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
msgid "show key during import"
msgstr "mostra empremta"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:152
++#: g10/import.c:156
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "la clau secreta és inusable"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "es descarta un bloc de tipus %d\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "fins ara s'han processat %lu claus\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Nombre total processat: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " claus noves descartades: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " claus noves descartades: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sense ID: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importades: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " no modificades: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " ID d'usuaris nous: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " subclaus noves: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " signatures noves: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " noves revocacions: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " claus privades llegides: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "claus privades importades: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "claus privades no canviades: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " importades: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signatures noves: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " claus privades llegides: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1042
++#: g10/import.c:1048
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "signatura %s, algorisme de resum %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "clau %08lX: sense ID\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "es descarta «%s»: %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1264
++#: g10/import.c:1343
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada «%s»\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "clau %08lX: l'ID no és vàlid\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "açò pot ser causat per l'absència d'autosignatura\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "clau %08lX: no s'ha trobat la clau pública: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "clau %08lX: clau nova - es descarta \n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "no s'ha trobat cap anell escrivible: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "clau %08lX: s'ha importat la clau pública «%s»\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "clau %08lX: no correspon a la nostra còpia\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "clau %08lX: «%s» 1 signatura nova\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "clau %08lX: «%s» %d signatures noves\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "clau %08lX: «%s» 1 subclau nova\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "clau %08lX: «%s» %d subclaus noves\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "clau %08lX: «%s» %d signatures noves\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "clau %08lX: «%s» %d signatures noves\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "clau %08lX: «%s» no ha estat modificada\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "clau %08lX: s'ha importat la clau secreta\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "es descarta: la clau secreta ja és present\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
@@@ -3738,12 -2936,10 +3712,12 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
@@@ -3753,22 -2949,18 +3727,22 @@@
# O «rebutjara»? ivb
# Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
# «es rebutja» està bé. jm
- #: g10/import.c:2182
++#: g10/import.c:2275
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "clau %08lX: el certificat de revocació és invàlid: %s: es rebutja\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "clau %08lX: s'ha importat el certificat de revocació «%s»\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "clau %08lX: no hi ha ID per a la signatura\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
@@@ -3776,116 -2968,95 +3750,116 @@@
"«%s»\n"
"\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "clau %08lX: l'autosignatura no és vàlida en l'id d'usuari «%s»\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "clau %08lX: s'ha eliminat un enllaç de subclau múltiple\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "clau %08lX: no hi ha una subclau per a la clau de revocació\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "clau %08lX: Subclau de revocació no vàlida\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "clau %08lX: s'han eliminat subclaus de revocació múltiples\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clau %08lX: es descarta l'ID d'usuari '"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "clau %08lX: es descarta la subclau\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "clau %08lX: la signatura és inexportable (classe %02x) - es descarta\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr ""
"clau %08lX: el certificat de revocació és en el lloc equivocat - es "
"descarta\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "clau %08lX: el certificat de revocació és invàlid: %s - es descarta\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr ""
"clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
"descarta\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr ""
"clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVÍS: la clau %08lX pot estar revocada: s'adquireix la clau de revocació "
"%08lX\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
"present.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
@@@ -4244,8 -3353,6 +4218,8 @@@ msgstr "
msgid "Really sign? (y/N) "
msgstr "Signar realment? "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
@@@ -4747,14 -3752,10 +4721,14 @@@ msgstr "
"Teniu en compte que la validesa de la clau mostrada no és necessàriament\n"
"correcta a no ser que torneu a executar el programa.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
#, fuzzy
msgid "revoked"
msgstr "[revocada]"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5730,19 -4553,16 +5704,19 @@@ msgstr " Empremta digital =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "s'està comprovant l'anell «%s»\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "s'han comprovat %lu claus (%lu signatures)\n"
msgstr[1] "s'han comprovat %lu claus (%lu signatures)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, fuzzy, c-format
#| msgid "\t%lu keys updated\n"
msgid "%lu key cached"
@@@ -5750,7 -4570,6 +5724,7 @@@ msgid_plural "%lu keys cached
msgstr[0] "\t%lu clau actualitzades\n"
msgstr[1] "\t%lu clau actualitzades\n"
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5760,7 -4579,6 +5734,7 @@@ msgstr[1] "1 signatura errònia\n
# Fitxer indi fins final. Hau! ivb
# Grrr. Com em tracten els esclaus ja... jm
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: s'ha creat l'anell\n"
@@@ -5985,119 -4758,99 +5959,124 @@@ msgstr "revocació autònoma: useu \"gp
msgid "no signature found\n"
msgstr "Signatura correcta de \""
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Signatura INCORRECTA de \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Signatura caducada de \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Signatura correcta de \""
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "s'ha eliminat la verificació de signatura\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "no es poden tractar aquestes signatures múltiples\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Aquesta signatura va caducar el %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
# «%.*s» no serà una data? Caldrà «el» al davant. ivb
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ msgid " issuer \"%s\"\n"
+ msgstr " alias \""
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "La clau és disponible en: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[incert]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "Aquesta signatura va caducar el %s\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "Aquesta signatura caduca el %s\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "signatura %s, algorisme de resum %s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "binari"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "mode text"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "desconeguda"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "l'algoritme de clau pública és desconegut"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "No s'ha pogut comprovar la signatura: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "no és una signatura separada\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"AVÍS: s'han detectat múltiples signatures. Només es comprovarà la primera.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "signatura autònoma de classe 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "signatura de l'estil antic (PGP 2.x)\n"
@@@ -6286,99 -5004,44 +6265,55 @@@ msgstr "
msgid "subpacket of type %d has critical bit set\n"
msgstr "el subpaquet de tipus %d té el bit crític activat\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, fuzzy, c-format
- msgid " (main key ID %s)"
- msgstr " (ID de la clau principal %08lX)"
-
- # Com es canvia l'ordre dels arguments? jm
- # Ah, bingo! jm
- # Uh, ara torna a donar error. FIXME
- # La idea és ficar:
- # "Necessiteu la contrasenya per desblocar la clau secreta de l'usuari:\n"
- # "«%1$.*s»\n"
- # "clau %3$s de %2$u bits, ID %4$08lX, creada en %5$s%6$s\n"
- # jm
- # Se't passava l'argument «*». printf(3), hieroglyph(7). ivb
- # Ah! Prova-ho, no casque alguna cosa :P ivb
- # Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm
- #: g10/passphrase.c:277
- #, fuzzy, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Necessiteu la contrasenya per desblocar la clau secreta de l'usuari:\n"
- "«%2$.*1$s»\n"
- "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Introduïu la contrasenya\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "s'ha cancel·lat per l'usuari\n"
- #: g10/passphrase.c:483
++#: g10/passphrase.c:489
#, fuzzy, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "\n"
- "Necessiteu la contrasenya per desblocar la clau secreta de\n"
- "l'usuari: \""
-
- #: g10/passphrase.c:491
- #, fuzzy, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr ""
+ msgid " (main key ID %s)"
+ msgstr " (ID de la clau principal %08lX)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Realment voleu eliminar les claus seleccionades? "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Realment voleu eliminar les claus seleccionades? "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6584,128 -5212,101 +6519,128 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "Voleu usar de tota manera aquesta clau?"
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "AVÍS: S'està usant una clau no fiable!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
#, fuzzy
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr ""
"AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
"present.\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
#, fuzzy
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "AVÍS: Aquesta clau ha estat revocada pel propietari!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "AVÍS: Aquesta clau ha estat revocada pel propietari!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Açò podria significar que la signatura és falsificada.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "AVÍS: Aquesta subclau ha estat revocada pel propietari!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Nota: Aquesta clau ha estat desactivada.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Nota: La clau ha caducat!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "AVÍS: Aquesta clau no ve certificada per una signatura de confiança!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" No hi ha res que indique que la signatura pertany al seu propietari.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVÍS: La clau NO és de confiança!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " Probablement la signatura és FALSA.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "AVÍS: Aquesta clau no ve certificada per signatures prou fiables!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
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:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: es descarta: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: es descarta: la clau pública està desactivada\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, 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:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, 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:991
++#: g10/pkclist.c:995
#, 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:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6713,37 -5314,29 +6648,37 @@@ msgstr "
"\n"
"Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Usuari inexistent.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
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:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "La clau pública està desactivada.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "es descarta: la clau pública ja està establida\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "no hi ha adreces vàlides\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "clau %08lX: sense ID\n"
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "clau %08lX: sense ID\n"
@@@ -7031,7 -5572,6 +6966,7 @@@ msgstr[0] "la clau pública %08lX és %
msgstr[1] "la clau pública %08lX és %lu segons anterior a la signatura\n"
# Werner FIXME: Use ngettext. jm
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -7111,23 -5642,19 +7046,23 @@@ msgstr "
"AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
"no expandida.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s signatura de: «%s»\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"forçar l'algoritme de digest %s (%d) viola les preferències del destinatari\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "signatura:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "s'utilitzarà xifratge %s\n"
@@@ -7239,7 -5746,6 +7174,7 @@@ msgid "%s: directory does not exist!\n
msgstr "%s: el directori no existeix!\n"
# No em passe! ;) ivb
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "no s'ha pogut tancar «%s»: %s\n"
@@@ -7351,17 -5835,14 +7286,17 @@@ msgstr "no es poden tractar línies mé
msgid "input line longer than %d characters\n"
msgstr "la línia d'entrada és superior a %d caràcters\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
@@@ -7371,135 -5852,105 +7306,127 @@@
# Precissament acabem de parlar d'«implementat a la llista del GNOME
# i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
# encara no m'agraden massa... jm
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Algoritmes suportats:\n"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: error en escriure el registre de directoris: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Política: "
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "llista claus"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7509,93 -5960,78 +7436,93 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
msgid "Verified %ld messages signed by \"%s\"."
msgstr "|algo [fitxers]|imprimeix resums de missatges"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7606,20 -6042,16 +7533,20 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7636,8 -6068,6 +7563,7 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
@@@ -8188,7 -6509,6 +8114,7 @@@ msgstr "Introduïu el nom d'usuari:
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8244,16 -6553,13 +8170,16 @@@ msgid "
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8358,12 -6641,10 +8284,12 @@@ msgstr "
msgid "checking the CRL failed: %s"
msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, fuzzy, c-format
msgid "certificate with invalid validity: %s"
msgstr "problema en la lectura del certificat: %s\n"
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
#, fuzzy
msgid "certificate not yet valid"
msgstr "Certificat de revocació vàlid"
@@@ -8378,7 -6657,6 +8304,7 @@@ msgstr "Certificat de revocació vàlid
msgid "intermediate certificate not yet valid"
msgstr "Certificat de revocació vàlid"
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
#, fuzzy
msgid "certificate has expired"
msgstr "problema en la lectura del certificat: %s\n"
@@@ -8434,7 -6701,6 +8360,7 @@@ msgstr "Certificat de revocació vàlid
msgid " ( issuer valid from "
msgstr ""
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "Empremta digital:"
@@@ -8467,7 -6727,6 +8393,7 @@@ msgstr "Certificat correcte
msgid "self-signed certificate has a BAD signature"
msgstr ""
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
#, fuzzy
msgid "root certificate is not marked trusted"
msgstr ""
@@@ -8479,31 -6737,25 +8405,31 @@@
msgid "checking the trust list failed: %s\n"
msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
#, fuzzy
msgid "certificate chain too long\n"
msgstr "Certificat de revocació vàlid"
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
#, fuzzy
msgid "issuer certificate not found"
msgstr "Certificat de revocació vàlid"
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "verifica una signatura"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr ""
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
#, fuzzy
msgid "certificate is good\n"
msgstr "Certificat de revocació vàlid"
@@@ -8538,7 -6784,6 +8464,7 @@@ msgstr "
msgid "(this is the MD2 algorithm)\n"
msgstr ""
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
#, fuzzy
msgid "none"
msgstr "no"
@@@ -8585,36 -6825,28 +8511,36 @@@ msgstr "
"«%2$.*1$s»\n"
"clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr ""
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr ""
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr ""
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr ""
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr ""
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr ""
@@@ -9057,23 -7199,19 +8983,23 @@@ msgstr "
msgid "%s:%u: skipping this line\n"
msgstr " o = omet aquesta clau\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, 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:1673
++#: sm/gpgsm.c:1670
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "no s'ha pogut tancar «%s»: %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9136,7 -7262,6 +9062,7 @@@ msgstr "rev? hi ha problemes en la comp
msgid "error storing flags: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr ""
@@@ -9255,98 -7359,73 +9181,92 @@@ msgstr "
msgid "dropping %u certificates from the cache\n"
msgstr ""
- #: dirmngr/certcache.c:352
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
- msgid "can't access directory '%s': %s\n"
- msgstr "no es pot crear el directori «%s»: %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't parse certificate '%s': %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, fuzzy, c-format
msgid "certificate '%s' already cached\n"
msgstr "certificat duplicat: esborrat"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, fuzzy, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "certificat duplicat: esborrat"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, fuzzy, c-format
msgid "certificate '%s' loaded\n"
msgstr "certificat duplicat: esborrat"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, fuzzy, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr "Empremta digital:"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, fuzzy, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, fuzzy, c-format
msgid "permanently loaded certificates: %u\n"
msgstr "Certificat invàlid"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, fuzzy, c-format
msgid " runtime cached certificates: %u\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
#, fuzzy
msgid "certificate already cached\n"
msgstr "S'ha creat el certificat de revocació.\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
#, fuzzy
msgid "certificate cached\n"
msgstr "Certificat de revocació vàlid"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, fuzzy, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "error: l'empremta digital és invàlida\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, fuzzy, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, fuzzy, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
#, fuzzy
msgid "no issuer found in certificate\n"
msgstr "Certificat correcte"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, fuzzy, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "error en crear «%s»: %s\n"
@@@ -9609,7 -7637,6 +9529,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
@@@ -9632,7 -7656,6 +9552,7 @@@ msgstr "la resposta de l'agent és inv�
msgid "converting S-expression failed: %s\n"
msgstr "no s'han pogut canviar els permissos de «%s»: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, fuzzy, c-format
#| msgid "changing permission of `%s' failed: %s\n"
msgid "creating S-expression failed: %s\n"
@@@ -10037,116 -7980,85 +9957,112 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr ""
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
#, fuzzy
msgid "run without asking a user"
msgstr "Voleu eixir sense desar? "
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
#, 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:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10159,77 -8071,61 +10075,77 @@@ msgstr "
"@\n"
"(En la pàgina del man hi ha una llista completa d'ordres i d'opcions)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "forma d'ús: gpg [opcions] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
#, 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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "la línia és massa llarga\n"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "error: l'empremta digital és invàlida\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "error de lectura: %s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
@@@ -10238,17 -8134,14 +10154,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:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "no forçat"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10594,102 -8417,81 +10510,102 @@@ msgstr "no s'han pogut canviar els perm
msgid "not signed by a default OCSP signer's certificate"
msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, fuzzy, c-format
msgid "allocating list item failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, fuzzy, c-format
msgid "error getting responder ID: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr ""
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, fuzzy, c-format
msgid "issuer certificate not found: %s\n"
msgstr "Certificat de revocació vàlid"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr ""
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
#, fuzzy
msgid "caller did not return the issuing certificate\n"
msgstr "Certificat correcte"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, fuzzy, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, fuzzy, c-format
#| msgid "%s: can't access: %s\n"
msgid "can't get authorityInfoAccess: %s\n"
msgstr "%s: no s'ha pogut accedir: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
#, fuzzy
#| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
msgstr "no hi ha anell secret predeterminat: %s\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr ""
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, fuzzy, c-format
msgid "using OCSP responder '%s'\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, fuzzy, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, fuzzy, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "NOTA: aquesta clau ha estat revocada!"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr ""
@@@ -10737,33 -8529,27 +10653,33 @@@ msgstr "no s'ha pogut eliminar el bloc
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, 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:2436
++#: dirmngr/server.c:2398
#, 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:2444
++#: dirmngr/server.c:2406
#, 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:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10788,34 -8570,24 +10704,30 @@@ msgstr "
msgid "checking CRL for"
msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
#, fuzzy
msgid "selfsigned certificate has a BAD signature"
msgstr "verifica una signatura"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, fuzzy, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
#, fuzzy
msgid "certificate chain is good\n"
msgstr "Certificat de revocació vàlid"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "ix"
@@@ -10943,11 -8684,9 +10855,11 @@@ msgstr "
msgid "Options enforcing a passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
@@@ -11087,85 -8794,66 +10999,85 @@@ msgstr "
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
#, fuzzy
msgid "list global configuration file"
msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
#, fuzzy
msgid "check global configuration file"
msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "fitxer d'eixida"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
#, fuzzy
msgid "Component not found"
msgstr "no s'ha trobat la clau pública"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
msgid "No argument allowed"
msgstr ""
@@@ -11218,124 -8897,99 +11130,124 @@@ msgid "
"Call a simple symmetric encryption tool\n"
msgstr ""
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s no és permés amb %s!\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, fuzzy, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "no es pot crear el directori «%s»: %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "no s'ha pogut obrir %s: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
# Execució de programes remots, o execució remota de programes? jm
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
#, fuzzy
msgid "no --program option provided\n"
msgstr "no hi ha suport per a l'execució remota de programes\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr ""
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr ""
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, fuzzy, c-format
msgid "could not fork: %s\n"
msgstr "%s: no s'ha trobat l'usuari: %s\n"
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "%s: no s'ha creat l'anell: %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr ""
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "l'algoritme de protecció %d%s no està suportat\n"
diff --cc po/cs.po
index af04a3f,d185c57..8c5c751
--- a/po/cs.po
+++ b/po/cs.po
@@@ -35,7 -35,6 +35,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg2 2.1.10\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2015-12-07 20:45+0100\n"
"Last-Translator: Petr Pisar <petr.pisar at atlas.cz>\n"
"Language-Team: Czech <gnupg-i18n at gnupg.org>\n"
@@@ -128,13 -112,9 +128,13 @@@ msgstr "
msgid "PIN:"
msgstr "PIN:"
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
msgid "Passphrase:"
msgstr "Heslo:"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr "neshodují se – zkuste to znovu"
@@@ -174,64 -146,42 +174,64 @@@ msgstr "Špatný PIN
msgid "Bad Passphrase"
msgstr "Špatné heslo"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "SSH klíče delší než %d bitů nejsou podporovány\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, c-format
msgid "can't create '%s': %s\n"
msgstr "nelze vytvořit „%s“: %s\n"
- #: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, c-format
msgid "can't open '%s': %s\n"
msgstr "nelze otevřít „%s“: %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "chyba při získání sériového čísla karty: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "nalezena karta se sériovým číslem: %s\n"
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "na kartě není autentizační klíč pro SSH: %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "nenalezen žádný vhodný klíč karty: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, c-format
msgid "shadowing the key failed: %s\n"
msgstr "výroba stínového klíče se nezdařila: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, c-format
msgid "error writing key: %s\n"
msgstr "chyba při zápisu klíče: %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -240,24 -190,19 +240,24 @@@ msgstr "
"Proces SSH si vyžádal použití klíče%%0A %s%%0A (%s)%%0APřejete si to "
"povolit?"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr "Povolit"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr "Zakázat"
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Prosím, vložte heslo pro SSH klíč%%0A %F%%0A (%c)"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Prosím, vložte toto heslo znovu"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -266,7 -211,6 +266,7 @@@ msgstr "
"Prosím, vložte heslo, abyste ochránil(a) přijatý tajný klíč%%0A %s%%0A %s"
"%%0Auvnitř úložiště klíčů gpg-agenta"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "ze socketu se nepodařilo se vytvořit proud (stream): %s\n"
@@@ -401,8 -319,6 +401,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:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -410,132 -326,94 +410,132 @@@ msgstr "
"@Volby:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr "poběží v režimu démona (na pozadí)"
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr "poběží v režimu serveru (na popředí)"
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "upovídaný režim"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "být o trochu víc tichý"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr "vypisovat příkazy ve stylu sh"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr "vypisovat příkazy ve stylu csh"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|SOUBOR|načíst volby ze SOUBORU"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr "neodpojovat se od konzole"
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr "neuzurpovat si klávesnici a myš"
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "použít pro server soubor s protokolem"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PROGRAM|použít PROGRAM jako PIN-Entry program"
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PROGRAM|použít PROGRAM jako SCdaemon program"
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
msgid "do not use the SCdaemon"
msgstr "nepoužívat SCdémona"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
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:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr "ignorovat požadavky na změnu TTY"
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr "ignorovat požadavky na změnu X displeje"
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|zahodit zapamatované PINy po N sekundách"
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr "nepoužívat paměť PINů na podepisování"
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
msgid "disallow the use of an external password cache"
msgstr "nedovolit použít vnější úložiště na hesla"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr "nedovolit klientům označovat klíče za „důvěryhodné“"
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
msgid "allow presetting passphrase"
msgstr "umožnit přednastavení hesla"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
#, fuzzy
#| msgid "allow caller to override the pinentry"
msgid "disallow caller to override the pinentry"
msgstr "umožnit volajícímu přebít pinentry"
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr "umožnit zadání hesla skrze Emacs"
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
msgid "enable ssh support"
msgstr "zapnout podporu pro OpenSSH"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Chyby v programu, prosím, oznamujte (anglicky) na <@EMAIL@>,\n"
"připomínky k překladu hlaste na <gnupg-i18n at gnupg.org>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Použití: @GPG_AGENT@ [volby] (-h pro nápovědu)"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -543,110 -421,74 +543,101 @@@ msgstr "
"Syntaxe: @GPG_AGENT@ [volby] [příkaz [argumenty]]\n"
"Správa tajných klíčů pro @GNUPG@\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "zadána neplatná úroveň ladění „%s“\n"
- # První argument je název knihovny
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, 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"
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, c-format
msgid "option file '%s': %s\n"
msgstr "soubor s možnostmi „%s“: %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, c-format
msgid "reading options from '%s'\n"
msgstr "čtou se možnosti z „%s“\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, c-format
msgid "can't create socket: %s\n"
msgstr "socket nelze vytvořit: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "název socketu „%s“ je příliš dlouhý\n"
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
msgid "error getting nonce for the socket\n"
msgstr "chyba při získávání soli pro socket\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, 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:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, 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:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, c-format
msgid "listen() failed: %s\n"
msgstr "volání listen() selhalo: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, c-format
msgid "listening on socket '%s'\n"
msgstr "naslouchá se na socketu „%s“\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "nelze vytvořit adresář „%s“: %s\n"
- #: agent/gpg-agent.c:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "adresář „%s“ vytvořen\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "volání stat() na „%s“ selhalo: %s\n"
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "„%s“ nelze použít jako domovský adresář\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "chyba při čtení soli z deskriptoru %d: %s\n"
@@@ -661,28 -501,22 +652,28 @@@ msgstr "obsluha 0x%lx pro fd %d spušt�
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "obsluha 0x%lx pro fd %d ukončena\n"
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, 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:2390
++#: agent/gpg-agent.c:2392
#, 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:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_pselect selhala: %s – čeká se 1 s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s pozastaveno\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "v této relaci neběží žádný gpg-agent\n"
@@@ -698,8 -530,6 +689,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:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -707,9 -537,6 +698,9 @@@ msgstr "
"@Příkazy:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -731,15 -556,12 +722,15 @@@ msgstr "
"Syntaxe: gpg-protect-tool [volby] [argumenty]\n"
"Nástroj na správu tajných klíčů\n"
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Prosím, vložte heslo, abyste zpřístupnili objekt PKCS#12."
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Prosím, vložte heslo, abyste ochránili nový objekt PKCS#12."
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
@@@ -747,7 -569,6 +738,7 @@@ msgstr "
"Prosím, zadejte heslo, abyste ochránili importovaný objekt uvnitř systému "
"GnuPG."
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -755,16 -576,13 +746,16 @@@ msgstr "
"Prosím, vložte heslo nebo PIN\n"
"potřebný pro dokončení této operace."
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
msgid "cancelled\n"
msgstr "zrušeno\n"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, c-format
msgid "error opening '%s': %s\n"
msgstr "chyba při otevírání „%s“: %s\n"
@@@ -934,43 -723,31 +925,43 @@@ msgstr "ochranný algoritmus %d (%s) ne
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "ochranný algoritmus %d (%s) není podporován\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "chyba při vytváření roury: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "chyba při vytváření proudu pro rouru: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, c-format
msgid "error forking process: %s\n"
msgstr "chyba při rozdvojování procesu: %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
#| msgid "waiting for process %d to terminate failed: %s\n"
msgid "waiting for processes to terminate failed: %s\n"
msgstr "čekání na konec procesu %d se nezdařilo: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr "chyba při spouštění „%s“: pravděpodobně není nainstalován\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "chyba v běhu „%s“: návratový kód %d\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, c-format
msgid "error running '%s': terminated\n"
msgstr "chyba v běhu „%s“: násilně ukončeno\n"
@@@ -985,34 -760,13 +976,16 @@@ msgstr "chyba při získání návratov
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "čekání na konec procesu %d se nezdařilo: %s\n"
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "nelze se připojit k „%s“: %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "problémy v komunikaci s gpg-agentem\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
msgid "problem setting the gpg-agent options\n"
msgstr "problém v nastavování voleb gpg-agenta\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- msgid "canceled by user\n"
- msgstr "zrušeno uživatelem\n"
-
- #: common/simple-pwquery.c:579
- msgid "problem with the agent\n"
- msgstr "problém s agentem\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- #| msgid "problem with the agent: %s\n"
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "problém s agentem: %s\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "nemohu vypnout vytváření core souborů: %s\n"
@@@ -1099,7 -836,6 +1072,7 @@@ msgstr "%s:%u: zastaralý parametr „%
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "VAROVÁNÍ: „%s%s“ je zastaralý parametr – neúčinkuje\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr "neznámý ladicí příznak „%s“ se ignoruje\n"
@@@ -1122,17 -854,14 +1095,17 @@@ msgstr "spojení na agenta ustanoveno\n
msgid "connection to agent is in restricted mode\n"
msgstr "spojení na agenta je v omezeném režimu\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr "žádný dirmngr neběží – spouští se „%s“\n"
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "čeká se na dirmngr… (%d s)\n"
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr "spojení na dirmngr ustanoveno\n"
@@@ -1391,7 -1060,6 +1364,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:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
msgid "out of core\n"
msgstr "nedostatek paměti\n"
@@@ -1449,7 -1106,11 +1422,14 @@@ msgstr "zámek „%s“ nebyl vytvořen
msgid "waiting for lock %s...\n"
msgstr "čekám na zámek %s…\n"
+ # První argument je název knihovny
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, 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"
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "ASCII kódování: %s\n"
@@@ -1689,10 -1295,6 +1669,10 @@@ msgstr "URL pro získání veřejného
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Chyba: URL je příliš dlouhé (limit je %d znaků).\n"
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, c-format
msgid "error reading '%s': %s\n"
msgstr "chyba při čtení „%s“: %s\n"
@@@ -1973,26 -1510,17 +1953,26 @@@ msgstr "administrátorské příkazy ne
msgid "Invalid command (try \"help\")\n"
msgstr "Neplatný příkaz (zkuste „help“)\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output pro tento příkaz není platný\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "„%s“ nelze otevřít\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "klíč „%s“ nenalezen: %s\n"
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "chyba při čtení bloku klíče: %s\n"
@@@ -2053,43 -1569,35 +2033,43 @@@ msgid "use option \"--delete-secret-key
msgstr ""
"abyste ho smazal(a), použijte nejprve parametr „--delete-secret-key“.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "chyba při vytváření hesla: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "v módu S2K nelze použít symetrický ESK paket\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "použití šifry: %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, c-format
msgid "'%s' already compressed\n"
msgstr "„%s“ je již zkomprimován\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "VAROVÁNÍ: soubor „%s“ je prázdný\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, c-format
msgid "reading from '%s'\n"
msgstr "čte se z „%s“\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"VAROVÁNÍ: vyžádaná symetrická šifra %s (%d) nevyhovuje předvolbám příjemce\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2098,17 -1606,14 +2078,17 @@@ msgstr "
"VAROVÁNÍ: vyžádaný komprimační algoritmus %s (%d) nevyhovuje předvolbám "
"příjemce\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "vyžádaná symetrická šifra %s (%d) nevyhovuje předvolbám příjemce\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s zašifrovaný pro: „%s“\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "použití %s není v módu %s dovoleno\n"
@@@ -2212,8 -1696,6 +2192,8 @@@ msgid " - skipped
msgstr " – přeskočeno"
# g10/import.c:766 g10/openfile.c:261#, c-format
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, c-format
msgid "writing to '%s'\n"
msgstr "zapisuje se do „%s“\n"
@@@ -2246,8 -1721,6 +2226,8 @@@ msgstr "chyba při vytváření „%s�
msgid "[User ID not found]"
msgstr "[ID uživatele nenalezeno]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(zkontrolujte argument volby „%s“)\n"
@@@ -2322,161 -1782,122 +2302,161 @@@ msgstr "Neplatný klíč %s změněn n
msgid "using subkey %s instead of primary key %s\n"
msgstr "používám podklíč %s místo primárního klíče %s\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
msgid "make a signature"
msgstr "vytvořit podpis"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
msgid "make a clear text signature"
msgstr "vytvořit podpis v čitelném dokumentu"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "vytvořit podpis oddělený od dokumentu"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "šifrovat data"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "šifrování pouze se symetrickou šifrou"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "dešifrovat data (implicitně)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verifikovat podpis"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "vypsat seznam klíčů"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "vypsat seznam klíčů a podpisů"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "list and check key signatures"
msgstr "vypsat a zkontrolovat podpisy klíčů"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "vypsat seznam klíčů a otisků"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "vypsat seznam tajných klíčů"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "vytvořit nový pár klíčů"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
msgid "quickly generate a new key pair"
msgstr "rychle vytvořit nový pár klíčů"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
msgid "quickly add a new user-id"
msgstr "rychle přidat novou identitu uživatele"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "quickly add a new user-id"
msgid "quickly revoke a user-id"
msgstr "rychle přidat novou identitu uživatele"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr "komplexní vytvoření páru klíčů"
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "vytvořit revokační certifikát"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "odstranit klíč ze souboru veřejných klíčů"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "odstranit klíč ze souboru tajných klíčů"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
msgid "quickly sign a key"
msgstr "rychle podepsat klíč"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
msgid "quickly sign a key locally"
msgstr "rychle lokálně podepsat klíč"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "podepsat klíč"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "podepsat klíč lokálně"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "podepsat nebo modifikovat klíč"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "změnit heslo"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "exportovat klíče"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "exportovat klíče na server klíčů"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "importovat klíče ze serveru klíčů"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "vyhledat klíče na serveru klíčů"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "aktualizovat všechny klíče ze serveru klíčů"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "importovat/sloučit klíče"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr "vytisknout stav karty"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr "změnit data na kartě"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr "změnit PIN karty"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "aktualizovat databázi důvěry"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
msgid "print message digests"
msgstr "vypsat hash zprávy"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "pracovat v režimu serveru"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
#, fuzzy
#| msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
msgid "|VALUE|set the TOFU policy for a key"
@@@ -2484,43 -1905,33 +2464,43 @@@ msgstr "
"|HODNOTA|nastavit TOFU politiku klíči (good [dobrý], unknown [neznámý], bad "
"[špatný], ask [zeptat se], auto)"
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "vytvoř výstup zakódovaný pomocí ASCII"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ID_UŽIVATELE|šifrovat pro ID_UŽIVATELE"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|ID_UŽIVATELE|použít toto ID_UŽIVATELE pro podepsání nebo dešifrování"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|nastavit úroveň komprese na N (0 – žádná)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "použít kanonický textový mód"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|SOUBOR|zapsat výstup do SOUBORU"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "neprovádět žádné změny"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "vyžádat potvrzení před přepsáním"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr "použít chování striktně podle OpenPGP"
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2528,7 -1939,6 +2508,7 @@@ msgstr "
"@\n"
"(Pro kompletní seznam všech příkazů a možností použijte manuálové stránky.)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2546,11 -1956,9 +2526,11 @@@ msgstr "
" --list-keys [jména] vypsat klíče\n"
" --fingerprint [jména] vypsat otisky\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Použití: @GPG@ [možnosti] [soubory] (-h pro nápovědu)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2560,7 -1968,6 +2540,7 @@@ msgstr "
"Podepisuje, ověřuje, šifruje nebo dešifruje.\n"
"Výchozí operace závisí na vstupních datech.\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2568,78 -1975,63 +2548,78 @@@ msgstr "
"\n"
"Podporované algoritmy:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "Veřejný klíč: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Šifra: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Komprese: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "použití: %s [přepínače] %s\n"
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "konfliktní příkazy\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "no = podpis nalezen v definici skupiny „%s“\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr ""
"VAROVÁNÍ: vlastnictví domovského adresáře „%s“ není nastaveno bezpečně\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr ""
"VAROVÁNÍ: vlastnictví konfiguračního souboru „%s“ není nastaveno bezpečně\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr ""
"VAROVÁNÍ: vlastnictví rozšiřujícího modulu „%s“ není nastaveno bezpečně\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "VAROVÁNÍ: přístupová práva pro domovský adresář „%s“ nejsou bezpečná\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr ""
"VAROVÁNÍ: přístupová práva pro konfigurační soubor „%s“ nejsou bezpečná\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "VAROVÁNÍ: přístupová práva rozšiřujícímu modulu „%s“ nejsou bezpečná\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"VAROVÁNÍ: vlastnictví adresáře s domovským adresářem „%s“ není nastaveno "
"nebezpečně\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2647,21 -2039,18 +2627,21 @@@ msgstr "
"VAROVÁNÍ: vlastnictví adresáře „%s“ s konfiguračním souborem není nastaveno "
"nebezpečně\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"VAROVÁNÍ: vlastnictví adresáře „%s“ s rozšiřujícím modulem není nastaveno "
"nebezpečně\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"VAROVÁNÍ: přístupová práva k adresáři „%s“ s domovským adresářem nejsou "
"nastavena bezpečně\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2669,7 -2058,6 +2649,7 @@@ msgstr "
"VAROVÁNÍ: přístupová práva k adresáři „%s“ s konfiguračním souborem nejsou "
"nastavena bezpečně\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
@@@ -2677,494 -2065,380 +2657,490 @@@
"nastavena bezpečně\n"
# c-format
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "neznámá konfigurační položka „%s“\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr "zobrazovat ID fotografií během výpisu klíčů"
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
msgid "show key usage information during key listings"
msgstr "ukazovat údaje o účelu klíče při výpisu klíčů"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr "ukazovat URL politik během výpisu podpisů"
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
msgid "show all notations during signature listings"
msgstr "ukazovat všechny poznámky během výpisu podpisů"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr "ukazovat poznámky IETF standardu během vypisování podpisů"
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr "ukazovat uživatelské poznámky během výpisu podpisů"
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
msgid "show preferred keyserver URLs during signature listings"
msgstr "ukazovat URL upřednostňovaného serveru klíčů při výpisu podpisů"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr "ukazovat platnost ID uživatelů při výpisu klíčů"
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr "ukazovat odvolané a prošlé ID uživatelů při výpisu klíčů"
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr "ukazovat odvolané a prošlé podklíče při výpisu klíčů"
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
msgid "show the keyring name in key listings"
msgstr "ukazovat název souboru s klíči při výpisu klíčů"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
msgid "show expiration dates during signature listings"
msgstr "ukazovat data expirace během výpisu podpisů"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
msgid "available TOFU policies:\n"
msgstr "dostupné politiky TOFU:\n"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "neznámá TOFU politika „%s“\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr "(možnosti lze vypsat příkazem „help“)\n"
- #: g10/gpg.c:2041
- #, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "neznámý formát „%s“ databáze TOFU\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "Poznámka: starý implicitní soubor s možnostmi „%s“ ignorován\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr "libgcrypt je příliš stará (potřebuji %s, mám %s)\n"
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "Poznámka: %s není pro normální použití!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "„%s“ není platná doba expirace podpisu\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ #| msgid "line %d: not a valid email address\n"
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "řádek %d: neplatná e-mailová adresa\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "neplatný režim pinentry „%s“\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "„%s“ není platná znaková sada\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "nelze zpracovat URL serveru klíčů\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatný parametr pro server klíčů\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
msgid "invalid keyserver options\n"
msgstr "neplatný parametr pro server klíčů\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatný parametr pro import\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "neplatný parametr pro import\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "neplatný parametr pro výpis\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatný parametr pro export\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "neplatný parametr pro export\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatný parametr pro výpis\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
msgid "invalid list options\n"
msgstr "neplatný parametr pro výpis\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr "zobrazovat ID fotografií při ověřování podpisu"
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr "ukazovat URL politik při ověřování podpisu"
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
msgid "show all notations during signature verification"
msgstr "ukazovat všechny poznámky při ověřování podpisu"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
msgid "show preferred keyserver URLs during signature verification"
msgstr "ukazovat URL upřednostňovaného serveru klíčů při ověřování podpisu"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
msgid "show user ID validity during signature verification"
msgstr "ukazovat platnost ID uživatele při ověřování podpisu"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr "ukazovat odvolané a prošlé ID uživatelů při ověřování podpisů"
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
msgid "show only the primary user ID in signature verification"
msgstr "ukazovat jen primární ID uživatele při ověřování podpisu"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr "ověřovat podpisy s daty PKA"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr "vyzvednout důvěru podpisů s platnými daty PKA"
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatný parametr pro ověření\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
msgid "invalid verify options\n"
msgstr "neplatný parametr pro ověření\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nelze nastavit exec-path na %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: neplatný seznam auto-key-locate\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr "neplatný seznam auto-key-locate\n"
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVÁNÍ: program může vytvořit soubor core!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROVÁNÍ: %s přepíše %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Není dovoleno používat %s s %s!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nedává s %s smysl!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr "VAROVÁNÍ: pracuji s podvrženým systémovým časem: "
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "nelze spustit s nebezpečnou pamětí vzhledem k %s\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "vybraný šifrovací algoritmus je neplatný\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "vybraný hashovací algoritmus je neplatný\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
msgid "selected compression algorithm is invalid\n"
msgstr "vybraný kompresní algoritmus je neplatný\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybraný hashovací algoritmus je neplatný\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "položka completes-needed musí být větší než 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "položka marginals-needed musí být větší než 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "položka max-cert-depth musí být v rozmezí od 1 do 255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr ""
"neplatná implicitní úroveň certifikace (default-cert-level); musí být 0, 1, "
"2 nebo 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr ""
"neplatná minimální úroveň certifikace (min-cert-level); musí být 0, 1, 2 "
"nebo 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Poznámka: jednoduchý mód S2K (0) je důrazně nedoporučován\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "neplatný mód S2K; musí být 0, 1 nebo 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "neplatné implicitní předvolby\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "neplatné uživatelské předvolby pro šifrování\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "neplatné uživatelské předvolby pro hashování\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "neplatné uživatelské předvolby pro komprimaci\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s dosud není funkční s %s\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "použití šifrovacího algoritmu „%s“ v módu %s není dovoleno\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "použití hashovacího algoritmu „%s“ v módu %s není dovoleno\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "použití kompresního algoritmu „%s“ v módu %s není dovoleno\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nemohu inicializovat databázi důvěry: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"VAROVÁNÍ: specifikován adresát (-r) bez použití šifrování s veřejným klíčem\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [jméno souboru]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [jméno souboru]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "symetrické šifrování „%s“ se nepovedlo: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [jméno souboru]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [jméno souboru]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
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:3929
++#: g10/gpg.c:3918
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "nelze použít --symmetric --encrypt v módu %s\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [jméno souboru]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [jméno souboru]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [jméno souboru]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
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:3989
++#: g10/gpg.c:3978
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "nelze použít --symmetric --sign --encrypt v módu %s\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [jméno souboru]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [jméno souboru]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [jméno souboru]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key id_uživatele"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key id_uživatele"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id_uživatele [příkazy]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
msgid "--passwd <user-id>"
msgstr "--passwd <id-uživatele>"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "odeslání na keyserver se nezdařilo: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "získání dat z serveru klíčů se nezdařilo: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "export klíče se nepodařil: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "export klíče se nepodařil: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "hledání na serveru klíčů se nezdařilo: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "obnovení dat na serveru klíčů se nezdařilo: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dekódování z ASCII formátu selhalo: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "kódování do ASCII formátu selhalo: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "neplatný hashovací algoritmus „%s“\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "chyba při rozboru názvu klíče „%s“: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr "„%s“ nevypadá jako platné ID klíče, otisk klíče nebo keygrip\n"
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[jméno souboru]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Začněte psát svou zprávu…\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "zadané URL pro certifikační politiku je neplatné\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "zadané URL pro podepisovací politiku je neplatné\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadané URL preferovaného serveru klíčů je neplatné\n"
@@@ -3205,135 -2471,107 +3181,135 @@@ msgstr "Nápověda není k dispozici
msgid "No help available for '%s'"
msgstr "Pro „%s“ není dostupná žádná nápověda"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr "importovat podpisy, které jsou označeny jen jako místní"
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr "opravit poškození vzniklá při importu z PKS serveru"
- #: g10/import.c:140
++#: g10/import.c:144
msgid "do not clear the ownertrust values during import"
msgstr "nemazat údaje o důvěře během importu"
- #: g10/import.c:143
++#: g10/import.c:147
msgid "do not update the trustdb after import"
msgstr "neaktualizovat databázi důvěry po importu"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "vypsat otisk klíče"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr "přijímat aktualizace pouze u existujících klíčů"
- #: g10/import.c:152
++#: g10/import.c:156
msgid "remove unusable parts from key after import"
msgstr "odstranit z klíče po importu nepoužitelné části"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr "odstranit po importu z klíče vše, co lze"
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "blok typu %d byl přeskočen\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu klíče byly doposud zpracovány\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Celkový počet zpracovaných klíčů: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " přeskočeny klíče PGP2: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " přeskočeny nové klíče: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " bez ID uživatele: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importováno: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " beze změn: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nové ID uživatelů: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nové podklíče: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " nové podpisy: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nové revokace klíčů: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " přečtené tajné klíče: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importované tajné klíče: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " tajné klíče nezměněny: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " neimportováno: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " odstraněné podpisy: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " odstraněné uživatelské ID: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3342,189 -2580,151 +3318,189 @@@ msgstr "
"VAROVÁNÍ: klíč %s obsahuje předvolby pro nedostupné\n"
"algoritmy na těchto ID uživatelů:\n"
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": předvolby pro šifrovací algoritmus %s\n"
- #: g10/import.c:1042
++#: g10/import.c:1048
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": předvolby pro podepisovací algoritmus %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": předvolby pro komprimační algoritmus %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "velmi doporučujeme aktualizaci nastavení vašich preferencí a\n"
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"distribuci tohoto klíče aby jste předešel problémům s neshodou algoritmů\n"
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "nelze aktualizovat předvolby s: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, c-format
msgid "key %s: no user ID\n"
msgstr "klíč %s: chybí identifikátor uživatele\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, c-format
msgid "key %s: %s\n"
msgstr "klíč %s: %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr "zamítnut kontrolou při importu"
- #: g10/import.c:1264
++#: g10/import.c:1343
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "klíč %s: poškození PKS podklíče opraveno\n"
# c-format
- #: g10/import.c:1282
++#: g10/import.c:1361
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "klíč %s: přijat id uživatele \"%s\",který není podepsán jím samým\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "klíč %s: chybí platný identifikátor uživatele\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "může to být způsobeno chybějícím podpisem klíče jím samým\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "klíč %s: veřejný klíč nenalezen: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "klíč %s: nový klíč - přeskočen\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "nenalezen zapisovatelný soubor klíčů (keyring): %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "chyba při zápisu souboru klíčů (keyring) „%s“: %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "klíč %s: veřejný klíč „%s“ importován\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "klíč %s: neodpovídá naší kopii\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "klíč %s: nemohu najít originální blok klíče: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "klíč %s: nemohu číst originální blok klíče: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "klíč %s: „%s“ 1 nový identifikátor uživatele\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "klíč %s: „%s“ %d nových identifikátorů uživatele\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "klíč %s: „%s“ 1 nový podpis\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "klíč %s: „%s“ %d nových podpisů\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "klíč %s: „%s“ 1 nový podklíč\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "klíč %s: „%s“ %d nových podklíčů\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "klíč %s: „%s“ %d podpisů odstraněno\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "klíč %s: „%s“ %d podpisů odstraněno\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "klíč %s: „%s“ %d ID uživatele odstraněno\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "klíč %s: „%s“ %d ID uživatele odstraněno\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "klíč %s: „%s“ beze změn\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, c-format
msgid "key %s: secret key imported\n"
msgstr "klíč %s: tajný klíč importován\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "klíč %s: tajný klíč již existuje\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "klíč %s: chyba při odesílání dat agentovi: %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, c-format
msgid "secret key %s: %s\n"
msgstr "tajný klíč %s: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
msgid "importing secret keys not allowed\n"
msgstr "import tajných klíčů není povolen\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "klíč %s: tajný klíč s neplatnou šifrou %d – přeskočeno\n"
@@@ -3539,139 -2739,112 +3515,139 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr "Pro migraci „%s“ u každé karty spusťte: %s\n"
- #: g10/import.c:2133
++#: g10/import.c:2226
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "klíč %s: chybí veřejný klíč – nemohu aplikovat revokační certifikát\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "klíč %s: neplatný revokační certifikát: %s – zamítnuto\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "klíč %s: „%s“ revokační certifikát importován\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "klíč %s: neexistuje id uživatele pro podpis\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"klíč %s: nepodporovaný algoritmus veřejného klíče u uživatelského ID „%s“\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "klíč %s neplatný podpis klíče jím samým u uživatelského ID „%s“\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "klíč %s: nepodporovaný algoritmus veřejného klíče\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "klíč %s: neplatný podpis klíče jím samým (direct key signature)\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "klíč %s: neexistuje podklíč pro vázání klíčů\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "klíč %s: neplatná vazba podklíče\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "klíč %s: smazána vícenásobná vazba podklíče\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "klíč %s: neexistuje podklíč pro revokaci klíče\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "klíč %s: neplatný revokační podklíč\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "klíč %s: smazána vícenásobná revokace podklíče\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "klíč %s: přeskočen identifikátor uživatele „%s“\n"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "klíč %s: podklíč přeskočen\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "klíč %s: podpis není exportovatelný (třída %02X) - přeskočeno\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "klíč %s: revokační certifikát na špatném místě - přeskočeno \n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "klíč %s: neplatný revokační certifikát: %s - přeskočen\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "klíč %s: podpis podklíče na špatném místě - přeskočeno \n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "klíč %s: neočekávaná podpisová třída (0x%02X) - přeskočeno\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "klíč %s: objeven duplikovaný identifikátor uživatele - sloučen\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"VAROVÁNÍ: klíč %s může být revokován: zkouším získat revokační klíč %s\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "VAROVÁNÍ: klíč %s může být revokován: revokační klíč %s nenalezen.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "klíč %s: „%s“ přidán revokační certifikát\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "klíč %s: podpis klíče jím samým (direct key signature) přidán\n"
@@@ -4016,8 -3127,6 +3992,8 @@@ msgstr "Velmi pečlivě jsem ověřil t
msgid "Really sign? (y/N) "
msgstr "Skutečně podepsat? (a/N) "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "podepsání selhalo: %s\n"
@@@ -4465,13 -3472,9 +4441,13 @@@ msgstr "
"být nutně správné, dokud znova nespustíte program.\n"
# status
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
msgid "revoked"
msgstr "odvolán"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "platnost skončila"
@@@ -5399,12 -4224,10 +5375,12 @@@ msgstr " Otisk klíče =
msgid " Card serial no. ="
msgstr " Sériové číslo karty ="
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, c-format
msgid "caching keyring '%s'\n"
msgstr "zapamatovává se soubor klíčů „%s“\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5413,7 -4236,6 +5389,7 @@@ msgstr[0] "%lu klíčů již uloženo
msgstr[1] "%lu klíčů již uloženo v keši (%lu podpisů)\n"
msgstr[2] "%lu klíčů již uloženo v keši (%lu podpisů)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, fuzzy, c-format
#| msgid "flush the cache"
msgid "%lu key cached"
@@@ -5422,7 -4244,6 +5398,7 @@@ msgstr[0] "vyprázdní keš
msgstr[1] "vyprázdní keš"
msgstr[2] "vyprázdní keš"
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5431,7 -4252,6 +5407,7 @@@ msgstr[0] "1 špatný podpis\n
msgstr[1] "1 špatný podpis\n"
msgstr[2] "1 špatný podpis\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: soubor klíčů (keyring) vytvořen\n"
@@@ -5653,114 -4428,95 +5629,120 @@@ msgstr "
msgid "no signature found\n"
msgstr "nenalezen žádná podpis\n"
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, c-format
msgid "BAD signature from \"%s\""
msgstr "ŠPATNÝ podpis od „%s“"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Podpis s vypršenou platností od „%s“"
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, c-format
msgid "Good signature from \"%s\""
msgstr "Dobrý podpis od „%s“"
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "verifikace podpisu potlačena\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
msgid "can't handle this ambiguous signature data\n"
msgstr "neumím pracovat s těmito nejednoznačnými daty\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, c-format
msgid "Signature made %s\n"
msgstr "Podpis vytvořen %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, c-format
msgid " using %s key %s\n"
msgstr " použití %s klíče %s\n"
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Podpis vytvořen %s pomocí klíče %s s ID uživatele %s\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ #| msgid " aka \"%s\""
+ msgid " issuer \"%s\"\n"
+ msgstr " alias „%s“"
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "Klíč k dispozici na: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[nejistý]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, c-format
msgid " aka \"%s\""
msgstr " alias „%s“"
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "Platnost podpisu skončila %s\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "Platnost podpisu skončí %s\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "podpis %s, hashovací algoritmus %s%s%s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "binární formát"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "textový formát"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "neznámý formát"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
msgid ", key algorithm "
msgstr ", algoritmus klíče"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr "POZOR: nejedná se o oddělený podpis. Soubor „%s“ NEBYL ověřen!\n"
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nemohu ověřit podpis: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "toto není podpis oddělený od dokumentu\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "VAROVÁNÍ: detekováno více podpisů. Kontrolován bude pouze první.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "samostatný podpis třídy 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis starého typu (PGP 2.x)\n"
@@@ -5936,83 -4657,38 +5918,49 @@@ msgstr "VAROVÁNÍ: potencionálně neb
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpacket typu %d má nastavený kritický bit\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, c-format
msgid "problem with the agent: %s\n"
msgstr "problém s agentem: %s\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, c-format
- msgid " (main key ID %s)"
- msgstr " (hlavní ID klíče %s)"
-
- #: g10/passphrase.c:277
- #, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Prosím, zadejte heslo, abyste odemkli tajný klíč příslušející OpenPGP "
- "certifikátu:\n"
- "„%.*s“\n"
- "Klíč o délce %u bitů, typ %s, ID %s\n"
- "vytvořený %s%s.\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Vložit heslo\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "zrušeno uživatelem\n"
- #: g10/passphrase.c:483
++#: g10/passphrase.c:489
#, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "Musíte znát heslo, abyste odemkli tajný klíč pro\n"
- "uživatele: „%s“\n"
-
- #: g10/passphrase.c:491
- #, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "délka %u bitů, typ %s, klíč %s, vytvořený %s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr " (podklíč na hlavním klíči ID %s)"
+ msgid " (main key ID %s)"
+ msgstr " (hlavní ID klíče %s)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Prosím, zadejte heslo, abyste odemkli tajný klíč OpenPGP:"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Prosím, zadejte heslo, abyste mohli importovat tajný klíč OpenPGP:"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Prosím, zadejte heslo, abyste mohli exportovat tajný podklíč OpenPGP:"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Prosím, zadejte heslo, abyste mohli exportovat tajný klíč OpenPGP:"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Opravdu chcete trvale smazat tajný klíč podklíče OpenPGP:"
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Opravdu chcete trvale smazat tajný klíč OpenPGP:"
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, c-format
msgid ""
"%s\n"
@@@ -6209,125 -4850,98 +6157,125 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "Použít přesto tento klíč? (a/N) "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "VAROVÁNÍ: Je použit nedůvěryhodný klíč!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "VAROVÁNÍ: tento klíč může být revokován (revokační klíč nenalezen)\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "VAROVÁNÍ: Tento klíč byl revokován klíčem s pověřením k revokaci!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "VAROVÁNÍ: Tento klíč byl revokován svým vlastníkem!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
msgid " This could mean that the signature is forged.\n"
msgstr " To může znamenat, že podpis je padělaný.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "VAROVÁNÍ: Tento podklíč byl revokován svým vlastníkem!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Poznámka: Tento klíč byl označen jako neplatný (disabled).\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Poznámka: Podepisovatelova ověřená adresa je „%s“\n"
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "Poznámka: Podepisovatelova adresa „%s“ se neshoduje s DNS záznamem\n"
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "úroveň důvěry opravena na PLNOU, kvůli platné PKA informaci\n"
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "úroveň důvěry opravena na ŽÁDNOU, kvůli špatné PKA informaci\n"
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Poznámka: Skončila platnost tohoto klíče!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "VAROVÁNÍ: Tento klíč není certifikován důvěryhodným podpisem!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Nic nenaznačuje tomu, že tento podpis patří vlastníkovi klíče.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "VAROVÁNÍ: NEDŮVĚŘUJEME tomuto klíči!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " Tento podpis je pravděpodobně PADĚLANÝ.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"VAROVÁNÍ: Tento klíč není certifikován dostatečně důvěryhodnými podpisy!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
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:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: přeskočeno: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, 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:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, 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:969
++#: g10/pkclist.c:973
#, fuzzy, c-format
#| msgid "can't connect to '%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "nelze se připojit k „%s“: %s\n"
- #: g10/pkclist.c:984
++#: g10/pkclist.c:988
#, 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:991
++#: g10/pkclist.c:995
#, 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:1094
++#: g10/pkclist.c:1098
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"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr "Aktuální příjemci:\n"
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6335,37 -4949,29 +6283,37 @@@ msgstr "
"\n"
"Napište identifikátor uživatele (user ID). Ukončete prázdným řádkem: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Takový identifikátor uživatele neexistuje.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
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:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "Veřejný klíč je neplatný (disabled).\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "přeskočeno: veřejný klíč je již nastaven\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "neznámý implicitní adresát „%s“\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "žádné platné adresy\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Poznámka: klíči %s chybí vlastnost %s\n"
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Poznámka: klíči %s chybí předvolby pro %s\n"
@@@ -6657,7 -5211,6 +6605,7 @@@ msgstr[0] "veřejný klíč %s je o %l
msgstr[1] "veřejný klíč %s je o %lu sekund novější než podpis\n"
msgstr[2] "veřejný klíč %s je o %lu sekund novější než podpis\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6743,12 -5287,10 +6691,12 @@@ msgstr "
"VAROVÁNÍ: nemohu %%-expandovat URL preferovaného keyservery (příliš dlouhé). "
"Použity neexpandované.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s podpis od: „%s“\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6756,11 -5298,9 +6704,11 @@@ msgstr "
"VAROVÁNÍ: vyžádaný hashovací algoritmus %s (%d) nevyhovuje předvolbám "
"příjemce\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "podepisuji:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "bude použito šifrování %s\n"
@@@ -6865,7 -5385,6 +6813,7 @@@ msgstr "transakce s databází důvěr
msgid "%s: directory does not exist!\n"
msgstr "%s: adresář neexistuje!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, c-format
msgid "can't access '%s': %s\n"
msgstr "k „%s“ nelze přistoupit: %s\n"
@@@ -6974,109 -5471,83 +6922,101 @@@ 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:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "chyba při odesílání standardního parametru: %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "nepodporovaný algoritmus: %s"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "chyba při odesílání dat: %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing base64 encoding: %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "chyba při zápisu kódování base64: %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "error initializing reader object: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "chyba při inicializaci čtecího objektu: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
#| msgid "error opening '%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "chyba při otevírání „%s“: %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "chyba při odesílání dat: %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
#| msgid "error getting responder ID: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "chyba při zjišťování ID odpovídače: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "platnost: %s"
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "chyba při získání uložených příznaků: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, 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"
@@@ -7084,18 -5555,15 +7024,18 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "vypsat seznam klíčů"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
@@@ -7103,7 -5571,6 +7043,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%ld message signed"
@@@ -7112,7 -5579,6 +7052,7 @@@ msgstr[0] "vypsat hash zprávy
msgstr[1] "vypsat hash zprávy"
msgstr[2] "vypsat hash zprávy"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
@@@ -7120,7 -5586,6 +7060,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
@@@ -7128,7 -5593,6 +7068,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7139,28 -5603,23 +7079,28 @@@ msgstr[2] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
#| msgid "error setting OCSP target: %s\n"
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "chyba při nastavování cíle OCSP: %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
@@@ -7168,7 -5627,6 +7108,7 @@@ msgstr "chyba při vytváření roury:
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
@@@ -7176,7 -5634,6 +7116,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
@@@ -7184,7 -5641,6 +7124,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
@@@ -7192,7 -5648,6 +7132,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
@@@ -7200,7 -5655,6 +7140,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
@@@ -7208,7 -5662,6 +7148,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
@@@ -7216,25 -5669,21 +7156,25 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %ld messages signed by \"%s\"."
msgstr "vypsat hash zprávy"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7246,20 -5695,16 +7186,20 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7277,8 -5722,6 +7217,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error opening TOFU database: %s\n"
@@@ -7820,7 -6154,6 +7759,7 @@@ msgstr "|N|Prvotní nový PIN
msgid "run in multi server mode (foreground)"
msgstr "pracovat ve více serverové režimu (na popředí)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|ÚROVEŇ|nastaví ladicí úroveň na ÚROVEŇ"
@@@ -7872,17 -6194,14 +7811,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:785
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:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr "obsluha pro deskriptor %d spuštěna\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "obsluha pro deskriptor %d ukončena\n"
@@@ -7981,12 -6277,10 +7920,12 @@@ msgstr "prosím, ujistěte se, že „d
msgid "checking the CRL failed: %s"
msgstr "kontrola CRL se nezdařila: %s"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr "certifikát s chybnou platností: %s"
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr "certifikát ještě nenabyl platnosti"
@@@ -7998,7 -6290,6 +7937,7 @@@ msgstr "kořenový certifikát ještě
msgid "intermediate certificate not yet valid"
msgstr "mezilehlý certifikát ještě nezačal platit"
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
msgid "certificate has expired"
msgstr "certifikátu vypršela platnost"
@@@ -8047,7 -6327,6 +7986,7 @@@ msgstr " ( certifikát planý od
msgid " ( issuer valid from "
msgstr " ( vydavatel platný od "
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, c-format
msgid "fingerprint=%s\n"
msgstr "otisk=%s\n"
@@@ -8076,7 -6349,6 +8015,7 @@@ msgstr "v certifikátu nebyl nalezen v
msgid "self-signed certificate has a BAD signature"
msgstr "certifikát podepsaný sám sebou má ŠPATNÝ podpis"
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr "kořenový certifikát není označen jako důvěryhodný"
@@@ -8085,28 -6356,22 +8024,28 @@@
msgid "checking the trust list failed: %s\n"
msgstr "kontrola seznamu důvěry se nepodařila: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr "řetěz certifikátů je příliš dlouhý\n"
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr "certifikát vydavatele nebyl nalezen"
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
msgid "certificate has a BAD signature"
msgstr "certifikát má ŠPATNÝ podpis"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr "nalezen jiný možný odpovídající certifikát autority – zkusí se znovu"
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr "řetěz certifikátů je delší než dovoluje CA (%d)"
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
msgid "certificate is good\n"
msgstr "certifikát je v pořádku\n"
@@@ -8140,7 -6399,6 +8079,7 @@@ msgstr "(toto je algoritmus MD2)\n
# none serial, none date
# #-#-#-#-# cs.po (dirmngr 1.0.3) #-#-#-#-#
# status
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
msgid "none"
msgstr "žádný"
@@@ -8174,36 -6427,28 +8113,36 @@@ msgstr "
"sériové číslo %s, ID 0x%08lX,\n"
"vytvořen %s, platnost vyprší %s.\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr "žádné použití klíče není určeno – předpokládají se všechna použití\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "chyba při zjišťování informací o použití klíče: %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr "certifikát neměl být použit pro certifikování\n"
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr "certifikát neměl být použit pro podepsání OCSP odpovědi\n"
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr "certifikát neměl použit pro šifrování\n"
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr "certifikát neměl být použit pro podepsání\n"
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr "certifikát není použitelný pro šifrování\n"
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr "certifikát není použitelný pro podepisování\n"
@@@ -8623,21 -6778,17 +8562,21 @@@ msgstr "%s:%u: zadáno heslo bez uživa
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: přeskakuji tento řádek\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
msgid "could not parse keyserver\n"
msgstr "nelze rozebrat serveru klíčů\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "importují se běžné certifikáty „%s“\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "nelze podepsat pomocí „%s“: %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr "neplatný příkaz (neexistuje žádný implicitní příkaz)\n"
@@@ -8698,7 -6837,6 +8637,7 @@@ msgstr "problém při opakovaném hled�
msgid "error storing flags: %s\n"
msgstr "chyba při ukládání příznaků: %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr "Chyba – "
@@@ -8825,96 -6942,72 +8764,91 @@@ msgstr "zámek keše certifikátů nelz
msgid "dropping %u certificates from the cache\n"
msgstr "%u certifikátů bude z keše vyřazeno\n"
- #: dirmngr/certcache.c:352
- #, c-format
- msgid "can't access directory '%s': %s\n"
- msgstr "k adresáři „%s“ nelze přistoupit: %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, c-format
msgid "can't parse certificate '%s': %s\n"
msgstr "certifikát „%s“ nelze rozebrat: %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, c-format
msgid "certificate '%s' already cached\n"
msgstr "certifikát „%s“ je již zapamatován\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "zaveden důvěryhodný certifikát „%s“\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, c-format
msgid "certificate '%s' loaded\n"
msgstr "certifikát „%s“ zaveden\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr " otisk SHA1 = %s\n"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr "vydavatel ="
# XXX: align with msgid " issuer ="
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr " subjekt ="
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "chyba při zavádění certifikátu „%s“: %s\n"
# XXX: Align with msgid "runtime cached certificates:"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, c-format
msgid "permanently loaded certificates: %u\n"
msgstr " trvale zavedených certifikátů: %u\n"
# XXX: Align with msgid "permanently loaded certificates:"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, c-format
msgid " runtime cached certificates: %u\n"
msgstr "za běhu nakešovaných certifikátů: %u\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
msgid "certificate already cached\n"
msgstr "certifikát již v keši\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
msgid "certificate cached\n"
msgstr "certifikát uložen do keše\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, c-format
msgid "error caching certificate: %s\n"
msgstr "chyba při ukládání certifikátu do keše: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "neplatný řetězec otisku SHA1 „%s“\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "chyba při stahování certifikátu určeného sériovým číslem: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "chyba při stahovaní certifikátu určeného subjektem: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
msgid "no issuer found in certificate\n"
msgstr "v certifikátu nebyl nalezen vydavatel\n"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "chyba při zjišťování authorityKeyIdentifier: %s\n"
@@@ -9179,7 -7221,6 +9113,7 @@@ msgstr "sériové číslo %s je platné
msgid "error getting data from cache file: %s\n"
msgstr "chyba při získávání dat ze souboru keše: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, c-format
msgid "unknown hash algorithm '%s'\n"
msgstr "neznámý hašovací algoritmus „%s“\n"
@@@ -9198,7 -7236,6 +9132,7 @@@ msgstr "z libksba obdržen neplatný S
msgid "converting S-expression failed: %s\n"
msgstr "převod S-výrazu se nezdařil: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, c-format
msgid "creating S-expression failed: %s\n"
msgstr "výroba S-výrazu selhala: %s\n"
@@@ -9580,112 -7537,81 +9514,108 @@@ msgstr "očekáván absolutní název s
msgid "looking up '%s'\n"
msgstr "hledá se „%s“\n"
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr "poběží jako služba Windows (na pozadí)"
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr "vypíše obsah CRL keše"
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
msgid "|FILE|load CRL from FILE into cache"
msgstr "|SOUBOR|zavede CRL ze SOUBORU do keše"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|stáhne CRL z URL"
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr "vypne dirmngr"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr "vyprázdní keš"
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr "|SOUBOR|protokol z režimu serveru se zapíše do SOUBORU"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
msgid "run without asking a user"
msgstr "běží bez dotazování se uživatele"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr "vynutí zavedení zastaralých CRL"
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr "povolí odesílání OCSP dotazů"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr "zakáže použití HTTP"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr "zakáže použití LDAP"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr "ignoruje HTTP distribuční místa CRL "
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr "ignoruje LDAP distribuční místa CRL"
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr "ignoruje URL služby OCSP uvedené v certifikátu"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|všechny HTTP požadavky přesměruje na URL"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr "|STROJ|pro LDAP dotazy použije STROJ"
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "nepoužije náhradní stroje s --ldap-proxy"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
msgid "|FILE|read LDAP server list from FILE"
msgstr "|SOUBOR|načte seznam LDAP serverů ze SOUBORU"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
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:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 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:209
++#: dirmngr/dirmngr.c:196
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|použije OCSP odpovídače na URL"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr "|OTISK|OCSP odpovědi podepsané podle OTISKU"
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
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:222
++#: dirmngr/dirmngr.c:209
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:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr "směrovat veškerý síťový provoz skrz Tor"
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9694,11 -7620,9 +9624,11 @@@ msgstr "
"@\n"
"(Úplný seznam příkazů a voleb naleznete v „info“ manuálu.)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Použití: @DIRMNGR@ [volby] (-h pro nápovědu)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9706,78 -7630,61 +9636,78 @@@ msgstr "
"Syntaxe: @DIRMNGR@ [volby] [příkaz [argumenty]]\n"
"Přístup k serveru s klíči, CRL a OCSP z @GNUPG@\n"
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "platné úrovně ladění jsou: %s\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, c-format
msgid "usage: %s [options] "
msgstr "použití: %s [volby] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
msgid "colons are not allowed in the socket name\n"
msgstr "dvojtečky v názvu socketu jsou nepřípustné\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "stahování CRL z „%s“ selhalo: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "zpracování CRL z „%s“ selhalo: %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, 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:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: zjištěn neplatný otisk\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: chyba čtení: %s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, 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:1807
++#: dirmngr/dirmngr.c:1631
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:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr "přijat SIGUSR2 – žádná akce nedefinována\n"
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr "přijat SIGTERM – vypíná se…\n"
# TODO: plural
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "přijat SIGTERM – stále aktivních spojení: %d\n"
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
msgid "shutdown forced\n"
msgstr "vypnutí vynuceno\n"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr "přijat SIGINT – okamžité vypnutí\n"
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "přijat signál č. %d – žádná akce nedefinována\n"
@@@ -10107,99 -7944,78 +10037,99 @@@ msgstr "hašování OCSP odpovědi pro
msgid "not signed by a default OCSP signer's certificate"
msgstr "nepodepsáno výchozím OCSP certifikátem podepisovatele"
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr "v OCSP odpovědích je podporováno jen SHA-1\n"
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, c-format
msgid "allocating list item failed: %s\n"
msgstr "alokování prvku seznamu selhalo: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, c-format
msgid "error getting responder ID: %s\n"
msgstr "chyba při zjišťování ID odpovídače: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr "žádný vhodný certifikát pro ověření OCSP odpovědi nebyl nalezen\n"
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, c-format
msgid "issuer certificate not found: %s\n"
msgstr "certifikát vydavatele nenalezen: %s\n"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr "volající nevrátil cílový certifikát\n"
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
msgid "caller did not return the issuing certificate\n"
msgstr "volající nevrátil vydávající certifikát\n"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "alokace OCSP kontextu selhala: %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, c-format
msgid "can't get authorityInfoAccess: %s\n"
msgstr "authorityInfoAccess nelze získat: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr "žádný výchozí OCSP odpovídač nedefinován\n"
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
msgid "no default OCSP signer defined\n"
msgstr "žádný výchozí OCSP podepisovatel nedefinován\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr "použije se výchozí OCSP odpovídač „%s“\n"
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, c-format
msgid "using OCSP responder '%s'\n"
msgstr "použije se OCSP odpovídač „%s“\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr "nepodařilo se ustanovit hašovací kontext OCSP: %s\n"
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "chyba při zjišťování OCSP stavu cílového certifikátu: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr "stav certifikátu je: %s (nyní=%s, příště=%s)\n"
# status
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr "dobrý"
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "certifikát byl odvolán kdy: %s, důvod: %s\n"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr "OCSP odpovídač vrátil stav v budoucnosti\n"
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr "OCSP odpovídač vrátil ne současný stav\n"
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr "OCSP odpovídač vrátil příliš starý stav\n"
@@@ -10247,32 -8053,26 +10177,32 @@@ msgstr "volání fetch_next_cert selhal
msgid "max_replies %d exceeded\n"
msgstr "max_replies (max. odpovědí) %d překročeno\n"
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "řídící strukturu nelze alokovat: %s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "alokace kontextu assuan selhala: %s\n"
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "inicializace serveru selhala: %s\n"
- #: dirmngr/server.c:2444
++#: dirmngr/server.c:2406
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "registrace příkazu u Assuanu selhala: %s\n"
- #: dirmngr/server.c:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "problém příjmu Assuanu: %s\n"
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "zpracování Assuanu se nezdařilo: %s\n"
@@@ -10293,32 -8089,22 +10223,28 @@@ msgstr "nekontroluje se CRL pro
msgid "checking CRL for"
msgstr "kontroluje se CRL pro"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr "provoz v režimu kompatibility – řetěz certifikátů nezkontrolován!\n"
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
msgid "selfsigned certificate has a BAD signature"
msgstr "sám sebou podepsaný certifikát má CHYBNÝ podpis"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "kontrola důvěryhodnosti kořenového certifikátu selhala: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
msgid "certificate chain is good\n"
msgstr "řetěz certifikátů je v pořádku\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA požaduje použití 160bitového hašovacího algoritmu\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
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:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
msgid "quiet"
msgstr "stručný výstup"
@@@ -10444,11 -8199,9 +10370,11 @@@ msgstr "|N| nastavit maximální život
msgid "Options enforcing a passphrase policy"
msgstr "Volby vynucující politiku hesel"
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr "nedovolit obejít politiku hesel"
+#: tools/gpgconf-comp.c:567
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"
@@@ -10583,67 -8304,51 +10509,67 @@@ msgstr "Selhalo externí ověření kom
msgid "Note that group specifications are ignored\n"
msgstr "Vezměte na vědomí, že určení skupiny se ignoruje\n"
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr "vypsat všechny komponenty"
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr "zkontrolovat všechny programy"
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr "|KOMPONENTA|vypsat volby"
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr "|KOMPONENTA|změnit volby"
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr "|KOMPONENTA|zkontrolovat volby"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr "aplikovat globální implicitní hodnoty"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr "získat adresáře s nastavením @GPGCONF@"
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
msgid "list global configuration file"
msgstr "vypsat globální konfigurační soubor"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
msgid "check global configuration file"
msgstr "zkontrolovat globální konfigurační soubor"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr "znovu načíst všechny nebo zadané komponenty"
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr "spustit zadanou komponentu"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr "zabít zadanou komponentu"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "použít jako výstupní soubor"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr "provést změny za běhu, pokud to lze"
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Použití: @GPGCONF@ [volby] (-h pro nápovědu)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10651,15 -8356,12 +10577,15 @@@ msgstr "
"Syntaxe: @GPGCONF@ [volby]\n"
"Spravuje konfigurační volby nástrojů, které patří do systému @GNUPG@\n"
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr "Potřebuji jeden argument určující komponentu"
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
msgid "Component not found"
msgstr "Komponenta nenalezena"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
msgid "No argument allowed"
msgstr "Žádné argumenty nejsou povoleny"
@@@ -10710,122 -8403,97 +10636,122 @@@ msgstr "
"Syntaxe: symcryptrun --class TŘÍDA --program PROGRAM --keyfile SOUBOR "
"[VOLBY…] PŘÍKAZ [VSTUPNÍ_SOUBOR]\n"
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s nad %s byl ukončen s kódem %i\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, c-format
msgid "%s on %s failed with status %i\n"
msgstr "%s nad %s selhal s kódem %i\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "nelze vytvořit dočasný adresář „%s“: %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr "%s nelze otevřít pro zápis: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, c-format
msgid "error writing to %s: %s\n"
msgstr "chyba při zápisu do %s: %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, c-format
msgid "error reading from %s: %s\n"
msgstr "chyba při čtení z %s': %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, c-format
msgid "error closing %s: %s\n"
msgstr "chyba při zavírání chyba %s: %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
msgid "no --program option provided\n"
msgstr "nebyla zadána volba --program\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr "pouze --decrypt a --encrypt jsou podporovány\n"
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr "nebyla zadána volba --keyfile\n"
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr "nelze alokovat pole argumentů\n"
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, c-format
msgid "could not create pipe: %s\n"
msgstr "nelze vytvořit rouru: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, c-format
msgid "could not create pty: %s\n"
msgstr "nelze vytvořit PTY: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr "nelze se rozdvojit (fork): %s\n"
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, c-format
msgid "execv failed: %s\n"
msgstr "execv selhalo: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, c-format
msgid "select failed: %s\n"
msgstr "služba select() selhala: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, c-format
msgid "read failed: %s\n"
msgstr "čtení selhalo: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, c-format
msgid "pty read failed: %s\n"
msgstr "čtení z PTY selhalo: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, c-format
msgid "waitpid failed: %s\n"
msgstr "služba waitpid() selhala: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr "potomek byl ukončen s kódem %i\n"
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "nelze alokovat řetězec infile: %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "nelze alokovat řetězec outfile: %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr "musí být zadáno buď %s, nebo %s\n"
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr "nezadána žádná třída\n"
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, c-format
msgid "class %s is not supported\n"
msgstr "třída %s není podporována\n"
diff --cc po/da.po
index 59ad3d5,ab7d352..0567b70
--- a/po/da.po
+++ b/po/da.po
@@@ -14,7 -14,6 +14,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2012-11-01 20:27+0200\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@@ -122,13 -106,9 +122,13 @@@ msgstr "
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
msgid "Passphrase:"
msgstr "Adgangsfrase:"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr "matcher ikke - prøv igen"
@@@ -168,67 -140,45 +168,67 @@@ msgstr "Ugyldig PIN
msgid "Bad Passphrase"
msgstr "Ugyldig adgangsfrase"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh-nøgler større end %d bit er ikke understøttet\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, 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:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
msgstr "kan ikke åbne »%s«: %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "fejl ved indhentelse af serielnummer for kort: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "detekteret kort med S/N: %s\n"
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, fuzzy, c-format
#| msgid "error getting default authentication keyID of card: %s\n"
msgid "no authentication key for ssh on card: %s\n"
msgstr "fejl ved indhentelse af standard-keyID for godkendelses af kort: %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "ingen egnet kortnøgle fundet: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, c-format
msgid "shadowing the key failed: %s\n"
msgstr "skygge for nøgle mislykkedes: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, c-format
msgid "error writing key: %s\n"
msgstr "fejl ved skrivning af nøgle: %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -237,24 -187,19 +237,24 @@@ msgstr "
"En ssh-proces anmodte om brugen af nøgle%%0A %s%%0A (%s)%%0AØnsker du at "
"tillade dette"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr "Tillad"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr "Nægt"
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Indtast venligst adgangsfrasen for ssh-nøglen%%0A %F%%0A (%c)"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Genindtast venligst denne adgangsfrase"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -263,7 -208,6 +263,7 @@@ msgstr "
"Indtast venligst en adgangsfrase for at beskytte den modtaget hemmelige nøgle"
"%%0A %s%%0A %s%%0Ainden i gpg-agentens nøglelager"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
@@@ -420,8 -338,6 +420,8 @@@ msgstr "Indtast venligst adgangsfrasen
msgid "Please enter the new passphrase"
msgstr "Indtast venligst den nye adgangsfrase"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -429,138 -345,100 +429,138 @@@ msgstr "
"@Indstillinger:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr "kør i dæmontilstand (baggrunden)"
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr "kør i servertilstand (forgrunden)"
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "uddybende"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "vær mindre uddybende"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr "kommandoresultat i sh-stil"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr "kommandoresultat i csh-stil"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FIL|læs tilvalg fra FIL"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr "frakobl ikke fra konsollen"
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr "fang ikke tastatur og mus"
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "brug en logfil for serveren"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|brug PGM som PIN-Entry-program"
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|brug PGM som SCdaemon-program"
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
msgid "do not use the SCdaemon"
msgstr "brug ikke SCdaemon'en"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, 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:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr "ignorer forespørgsler om at ændre TTY'en"
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr "ignorer forespørgsler om at ændre X-skærmen"
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|udløb mellemlagrede PIN'er efter N sekunder"
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr "brug ikke PIN-mellemlageret når der underskrives"
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, 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:220
++#: agent/gpg-agent.c:219
#, 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:223
++#: agent/gpg-agent.c:222
msgid "allow presetting passphrase"
msgstr "tillad forhåndsindstilling af adgangsfrase"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
#, fuzzy
#| msgid "enable ssh-agent emulation"
msgid "enable ssh support"
msgstr "aktiver ssh-agent-emulering"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Rapporter venligst fejl til <@EMAIL@>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
#, 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:484
++#: agent/gpg-agent.c:483
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -572,120 -450,85 +572,112 @@@ msgstr "
"Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
"Hemmelig nøglehåndtering for GnuPG\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, 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:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr "%s er for gammel (kræver %s, har %s)\n"
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "tilvalgsfil »%s«: %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, 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:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, c-format
msgid "can't create socket: %s\n"
msgstr "kan ikke oprette sokkel: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, 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:1844
++#: agent/gpg-agent.c:1843
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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
msgid "error getting nonce for the socket\n"
msgstr "fejl ved indhentelse af nonce for soklen\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, 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:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, 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:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() mislykkedes: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, 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:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, 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:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
msgstr "mappe »%s« oprettet\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, 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:1958
++#: agent/gpg-agent.c:1957
#, 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:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fejl ved læsning af nonce på fd %d: %s\n"
@@@ -700,29 -541,23 +692,29 @@@ msgstr "håndtering 0x%lx for fd %d sta
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "håndtering 0x%lx for fd %d termineret\n"
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, 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:2390
++#: agent/gpg-agent.c:2392
#, 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:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, 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:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppet\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "ingen gpg-agent kører i denne session\n"
@@@ -738,8 -571,6 +730,8 @@@ msgstr "
"Syntaks: gpg-preset-passphrase [tilvalg] KEYGRIP\n"
"Adgangskode for mellemlagervedligeholdelse\n"
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -747,9 -578,6 +739,9 @@@ msgstr "
"@Kommandoer:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -771,17 -597,14 +763,17 @@@ msgstr "
"Syntaks: gpg-protect-tool [tilvalg] [parametre]\n"
"Vedligeholdelsesværktøj for hemmelig nøgle\n"
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr ""
"Indtast venligst adgangsfrasen for at fjerne beskyttelsen på PKCS#12-"
"objektet."
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
@@@ -789,7 -612,6 +781,7 @@@ msgstr "
"Indtast venligst adgangsfrasen for at beskytte det importeret objekt inden i "
"GnuPG-systemet."
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -797,16 -619,13 +789,16 @@@ msgstr "
"Indtast venligst adgangsfrasen eller PIN'en\n"
"krævet for at færdiggøre denne handling."
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
msgid "cancelled\n"
msgstr "afbrudt\n"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -990,46 -780,34 +982,46 @@@ msgstr "beskyttelsesalgoritme %d%s er i
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "beskyttelsesalgoritme %d%s er ikke understøttet\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "fejl ved oprettelse af datakanal: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error creating a stream for a pipe: %s\n"
msgstr "fejl ved oprettelse af datakanal: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, c-format
msgid "error forking process: %s\n"
msgstr "fejl ved forgrening af proces: %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
#| msgid "waiting for process %d to terminate failed: %s\n"
msgid "waiting for processes to terminate failed: %s\n"
msgstr "ventning på at proces %d skulle terminere mislykkedes: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, fuzzy, c-format
#| msgid "error running `%s': probably not installed\n"
msgid "error running '%s': probably not installed\n"
msgstr "fejl ved kørsel af »%s«: sikkert ikke installeret\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
#| msgid "error running `%s': exit status %d\n"
msgid "error running '%s': exit status %d\n"
msgstr "fejl ved kørsel af »%s«: afslutningsstatus %d\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, fuzzy, c-format
#| msgid "error running `%s': terminated\n"
msgid "error running '%s': terminated\n"
@@@ -1045,35 -821,14 +1037,17 @@@ msgstr "fejl ved indhentelse af afslutn
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "ventning på at proces %d skulle terminere mislykkedes: %s\n"
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "kan ikke forbinde til »%s«: %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "kommunikationsproblem med gpg-agent\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
msgid "problem setting the gpg-agent options\n"
msgstr "problem ved angivelse af indstillinger for gpg-agent\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- msgid "canceled by user\n"
- msgstr "afbrudt af brugeren\n"
-
- #: common/simple-pwquery.c:579
- msgid "problem with the agent\n"
- msgstr "problem med agenten\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- #| msgid "problem with the agent: %s\n"
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "problem med agenten: %s\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "kan ikke slå kernedump fra: %s\n"
@@@ -1159,7 -897,6 +1133,7 @@@ msgstr "%s:%u: forældet indstilling »
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "ADVARSEL: »%s« er en forældet indstilling - den har ingen effekt\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1186,19 -919,16 +1160,19 @@@ msgstr "
msgid "connection to agent is in restricted mode\n"
msgstr "kan ikke forbinde til dirmngr - forsøger reserve\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, fuzzy, c-format
#| msgid "no running dirmngr - starting `%s'\n"
msgid "no running Dirmngr - starting '%s'\n"
msgstr "ingen kørende dirmngr - starter »%s«\n"
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, fuzzy, c-format
#| msgid "waiting %d seconds for the agent to come up\n"
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "venter %d sekunder på at agenten kommer frem\n"
- #: common/asshelp.c:672
++#: common/asshelp.c:639
#, fuzzy
#| msgid "can't connect to the dirmngr - trying fall back\n"
msgid "connection to the dirmngr established\n"
@@@ -1462,7 -1132,6 +1436,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:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
msgid "out of core\n"
msgstr "uden for kerne\n"
@@@ -1525,7 -1183,10 +1499,13 @@@ 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:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr "%s er for gammel (kræver %s, har %s)\n"
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "panser: %s\n"
@@@ -1766,10 -1372,6 +1746,10 @@@ msgstr "Adresse hvor offentlig nøgle s
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Fejl: Adresse er for lang (begrænsningen er %d tegn).\n"
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
@@@ -2070,27 -1607,18 +2050,27 @@@ msgstr "Administratorkommandoer er ikk
msgid "Invalid command (try \"help\")\n"
msgstr "Ugyldig kommando (prøv »help«)\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output virker ikke for denne kommando\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "kan ikke åbne »%s«\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, 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:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "fejl ved læsning af nøgleblok: %s\n"
@@@ -2151,39 -1667,32 +2131,39 @@@ msgstr "der er en hemmelig nøgle for o
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "brug tilvalget »--delete-secret-keys« for at slette den først.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "fejl ved oprettelse af adgangsfrase: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "kan ikke bruge en symmetrisk ESK-pakke på grund af S2K-tilstanden\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "bruger chiffer %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "»%s« allerede komprimeret\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "ADVARSEL: »%s« er en tom fil\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "læser fra »%s«\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2191,7 -1700,6 +2171,7 @@@ msgstr "
"ADVARSEL: Tvang for symmetrisk chiffer %s (%d) overtræder modtagerens "
"præferencer\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2200,18 -1708,15 +2180,18 @@@ msgstr "
"ADVARSEL: Tvang for komprimeringsalgoritme %s (%d) overtræder modtagerens "
"præferencer\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"tvang for symmetrisk chiffer %s (%d) overtræder modtagerens præferencer\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s krypteret for: »%s«\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "du kan ikke bruge %s i tilstanden %s\n"
@@@ -2321,8 -1805,6 +2301,8 @@@ msgstr "fjern så meget som muligt fra
msgid " - skipped"
msgstr "%s: udelod: %s\n"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2357,8 -1832,6 +2337,8 @@@ msgstr "fejl ved oprettelse af »%s«:
msgid "[User ID not found]"
msgstr "[Bruger-id blev ikke fundet]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
@@@ -2430,209 -1890,160 +2410,209 @@@ msgstr "Ugyldig nøgle %s gjort gyldig
msgid "using subkey %s instead of primary key %s\n"
msgstr "bruger undernøgle %s i stedet for primær nøgle %s\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
msgid "make a signature"
msgstr "opret en underskrift"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
msgid "make a clear text signature"
msgstr "opret en underskrift i klartekst"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "opret en separat underskrift"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "krypter data"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "krypter kun med symmetrisk chiffer"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "afkrypter data (standard)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "godkend en underskrift"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "vis nøgler"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "vis nøgler og underskrifter"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "list and check key signatures"
msgstr "vis og kontroller nøgleunderskrifter"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "vis nøgler og fingeraftryk"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "vis hemmelige nøgler"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "opret et nyt nøglepar"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "opret et nyt nøglepar"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "opret et nyt nøglepar"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "opret et nyt nøglepar"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "opret et tilbagekaldscertifikat"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "fjern nøgler fra den offentlige nøglering"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "fjern nøgler fra den hemmelige nøglering"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "underskriv en nøgle"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "underskriv en nøgle lokalt"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "underskriv en nøgle"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "underskriv en nøgle lokalt"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "underskriv eller rediger en nøgle"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "ændr en adgangsfrase"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "eksporter nøgler"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "eksporter nøgler til en nøgletjener"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "importer nøgler fra en nøgleserver"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "søg efter nøgler på en nøgleserver"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "opdater alle nøgler fra en nøgleserver"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "importer/sammenføj nøgler"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr "udskriv kortstatus"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr "ændr data på et kort"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr "ændr et korts PIN"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "opdater troværdighedsdatabasen"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
msgid "print message digests"
msgstr "vis beskedsammendrag"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "kør i servertilstand"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "opret ascii-pansrede uddata"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|krypter for BRUGER-ID"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|brug BRUGER-ID til at underskrive eller afkryptere"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|sæt komprimeringsniveauet til N (0 deaktiverer)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "brug kanonisk teksttilstand"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FILE|skriv resultat til FIL"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "lav ingen ændringer"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "spørg før overskrivning"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr "brug streng OpenPGP-opførsel"
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2640,7 -2051,6 +2620,7 @@@ msgstr "
"@\n"
"(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2660,14 -2070,12 +2640,14 @@@ msgstr "
" --list-keys [navne] vis nøgler\n"
" --fingerprint [navne] vis fingeraftryk\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
# Skal alt dette oversættes eller er det tilvalgene?
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2682,7 -2090,6 +2662,7 @@@ msgstr "
"Sign, check, encrypt eller decrypt\n"
"standardhandling afhænger af inddata\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2690,81 -2097,66 +2670,81 @@@ msgstr "
"\n"
"Understøttede algoritmer:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Chiffer: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Komprimering: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "brug: gpgsm [tilvalg] "
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "kommandoer er i konflikt\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, fuzzy, c-format
#| msgid "no = sign found in group definition `%s'\n"
msgid "no = sign found in group definition '%s'\n"
msgstr "ingen = tegn fundet i gruppedefinition »%s«\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "ADVARSEL: Usikker ejerskab af hjemmemappe »%s«\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "ADVARSEL: Usikker ejerskab på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on extension `%s'\n"
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "ADVARSEL: Usikker ejerskab på udvidelse »%s«\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "ADVARSEL: Usikre rettigheder på hjemmemappe »%s«\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "ADVARSEL: Usikre rettigheder på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on extension `%s'\n"
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "ADVARSEL: Usikre rettigheder på udvidelse »%s«\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "ADVARSEL: Usikkert indelukket mappeejerskab på hjemmemappe »%s«\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2773,19 -2165,16 +2753,19 @@@ msgid "
msgstr ""
"ADVARSEL: Usikkert indelukket mappeejerskab på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "ADVARSEL: Usikkert indelukket mappeejerskab på udvidelse »%s«\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "ADVARSEL: Usikre indelukkede mapperettigheder på hjemmemappe »%s«\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2795,516 -2184,400 +2775,511 @@@ msgid "
msgstr ""
"ADVARSEL: Usikre indelukkede mapperettigheder på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "ADVARSEL: Usikkert indelukket mapperettigheder på udvidelse »%s«\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "ukendt konfigurationspunkt »%s«\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr "vis billed-id'er under nøglevisninger"
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
#, fuzzy
#| msgid "show user ID validity during key listings"
msgid "show key usage information during key listings"
msgstr "vis bruger-id-validitet under nøglevisninger"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr "vil politikadresser under underskriftvisninger"
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
msgid "show all notations during signature listings"
msgstr "vis alle notationer under underskriftvisninger"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr "vis IETF-standardnotationer under underskriftvisninger"
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr "vis brugerangivne notationer under underskriftvisninger"
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
msgid "show preferred keyserver URLs during signature listings"
msgstr "vis foretrukne nøgleserveradresser under underskriftvisninger"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr "vis bruger-id-validitet under nøglevisninger"
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr "vis tilbagekaldte og udløbne bruger-id'er i nøglevisninger"
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr "vis tilbagekaldte og udløbne undernøgler i nøglevisninger"
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
msgid "show the keyring name in key listings"
msgstr "vis nøgleringsnavnet i nøglevisninger"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
msgid "show expiration dates during signature listings"
msgstr "vis udløbsdatoer under underskriftvisninger"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "Tilgængelige nøgler:\n"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "ukendt tilvalg »%s«\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- #| msgid "unknown command `%s'\n"
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "ukendt kommando »%s«\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, fuzzy, c-format
#| msgid "NOTE: old default options file `%s' ignored\n"
msgid "Note: old default options file '%s' ignored\n"
msgstr "BEMÆRK: Gammel standardfil for tilvalg »%s« blev ignoreret\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr "libgcrypt er for gammel (kræver %s, har %s)\n"
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "BEMÆRK: %s er ikke til normal brug!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, fuzzy, c-format
#| msgid "`%s' is not a valid signature expiration\n"
msgid "'%s' is not a valid signature expiration\n"
msgstr "»%s« er ikke et gyldigt underskriftudløb\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ #| msgid "line %d: not a valid email address\n"
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "linje %d: ikke en gyldig e-post-adresse\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, fuzzy, c-format
#| msgid "invalid country code in `%s', line %d\n"
msgid "invalid pinentry mode '%s'\n"
msgstr "ugyldig landekode i »%s«, linje %d\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, fuzzy, c-format
#| msgid "`%s' is not a valid character set\n"
msgid "'%s' is not a valid character set\n"
msgstr "»%s« er ikke et gyldigt tegnsæt\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "kunne ikke fortolke nøgleserveradresse\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ugyldige indstillinger for nøgleserver\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
msgid "invalid keyserver options\n"
msgstr "ugyldige indstillinger for nøgleserver\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ugyldige importindstillinger\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "ugyldige importindstillinger\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "ugyldige listeindstillinger\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ugyldige eksportindstillinger\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "ugyldige eksportindstillinger\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ugyldige listeindstillinger\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
msgid "invalid list options\n"
msgstr "ugyldige listeindstillinger\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr "vis billed-id'er under underskriftverificering"
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr "vis politikadresser under underskriftverificering"
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
msgid "show all notations during signature verification"
msgstr "vis alle notationer under underskriftverificering"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr "vis IETF-standardnotationer under underskriftverificering"
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr "vis brugerangivne notationer under underskriftverificering"
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
msgid "show preferred keyserver URLs during signature verification"
msgstr "vis foretrukne nøgleserveradresser under underskriftverificering"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
msgid "show user ID validity during signature verification"
msgstr "vis bruger-id-validitet under underskriftverificering"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr "vis tilbagekaldte og udløbne bruger-id'er i underskriftverificering"
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
msgid "show only the primary user ID in signature verification"
msgstr "vis kun den primære bruger-id i underskriftverificering"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr "valider underskrifter med PKA-data"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr "hæv troværdigheden for underskrifter med gyldige PKA-data"
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ugyldige verificeringsindstillinger\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
msgid "invalid verify options\n"
msgstr "ugyldige verificeringsindstillinger\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "kunne ikke angive kørselssti til %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ugyldig liste for auto-key-locate\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr "ugyldig liste for auto-key-locate\n"
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: program kan oprette en kernefil!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ADVARSEL: %s overskriver %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ikke tilladt med %s!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s er meningsløs sammen med %s!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr "ADVARSEL: kører med forfalsket systemtid: "
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "vil ikke køre med usikker hukommelse på grund af %s\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt chifferalgoritme er ugyldig\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "valgt sammendragsalgoritme er ugyldig\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
msgid "selected compression algorithm is invalid\n"
msgstr "valgt komprimeringsalgoritme er ugyldig\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "valgt algoritme for certifikationssammendrag er ugyldig\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed skal være større end 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed skal være større end 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth skal være i intervallet fra 1 til 255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "ugyldigt default-cert-level; skal være 0, 1, 2 eller 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ugyldigt min-cert-level; skal være 1, 2 eller 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "BEMÆRK: simpel S2K-tilstand (0) frarådes på det skarpeste\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ugyldig S2K-tilstand; skal være 0, 1 eller 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "ugyldige standardpræferencer\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "ugyldige præferencer for personlig chiffer\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "ugyldige præferencer for personlig sammendrag\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "ugyldige præferencer for personlig komprimering\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s virker endnu ikke med %s\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, fuzzy, c-format
#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "du må ikke bruge chifferalgoritmen »%s« i tilstanden %s\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, fuzzy, c-format
#| msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "du må ikke bruge sammendragsalgoritmen »%s« i tilstanden %s\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, fuzzy, c-format
#| msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "du må ikke bruge komprimeringsalgoritmen »%s« i tilstanden %s\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "kunne ikke initialisere TrustDB: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ADVARSEL: modtagere (-r) angivet uden brug af offentlig nøglekryptering\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [filnavn]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [filnavn]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, fuzzy, c-format
#| msgid "symmetric encryption of `%s' failed: %s\n"
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "symmetrisk kryptering af »%s« mislykkedes: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [filnavn]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filnavn]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "du kan ikke bruge --symmetric --encrypt med --s2k-mode 0\n"
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "du kan ikke bruge --symmetric --encrypt i tilstanden %s\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [filnavn]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filnavn]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "du kan ikke bruge --symmetric --sign --encrypt med --s2k-mode 0\n"
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "du kan ikke bruge --symmetric --sign --encrypt i tilstanden %s\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnavn]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [filnavn]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key bruger-id"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key bruger-id"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key bruger-id [kommandoer]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
msgid "--passwd <user-id>"
msgstr "--passwd <bruger-id>"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "nøgleserver send mislykkedes: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "nøgleserver modtag mislykkedes: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "nøgleeksport mislykkedes: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "nøgleeksport mislykkedes: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "nøgleserver søg mislykkedes: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "nøgleserver opdater mislykkedes: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "fjernelse af panser mislykkedes: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "påklædning af panser mislykkedes: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "ugyldig hash-algoritme »%s«\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error parsing key specification '%s': %s\n"
msgstr "fejl ved lagring af certifikat: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[filnavn]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Gå til sagen og skriv meddelelsen ...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "den angivne adresse for certifikatpolitik er ugyldig\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "den angivne adresse for underskriftpolitik er ugyldig\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angivne adresse for foretrukken nøgleserver er ugyldig\n"
@@@ -3346,138 -2611,110 +3321,138 @@@ msgstr "Ingen hjælp tilgængelig
msgid "No help available for '%s'"
msgstr "Ingen hjælp tilgængelig for »%s«"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr "importer underskrifter som er markeret som local-only"
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr "reparer skade fra pks-nøgleserveren under import"
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "opdater ikke trustdb efter import"
- #: g10/import.c:143
++#: g10/import.c:147
msgid "do not update the trustdb after import"
msgstr "opdater ikke trustdb efter import"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "vis nøglefingeraftryk"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr "accepter kun opdateringer til eksisterende nøgler"
- #: g10/import.c:152
++#: g10/import.c:156
msgid "remove unusable parts from key after import"
msgstr "fjern ubrugelige dele fra nøgle efter import"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr "fjern så meget som muligt fra nøgle efter import"
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr " udelader bloktype %d\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, c-format
msgid "%lu keys processed so far\n"
msgstr " %lu-nøgler behandlet\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Totalt antal behandl.: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " udeladte nye nøgler: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " udeladte nye nøgler: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " w/o bruger-id'er: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importerede: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " uændrede: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nye bruger-id'er: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nye undernøgler: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " nye underskrifter: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nye nøgletilbagekald: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " hemmelige nøgler læst: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " hemmel. nøgler import: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "hemmel. nøgler uændret: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " ikke importerede: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " underskrifter ryddet: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " bruger-id'er ryddet: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3486,194 -2723,156 +3461,194 @@@ msgstr "
"ADVARSEL: nøgle %s indeholder præferencer for utilgængelige\n"
"algoritmer på disse bruger-id'er:\n"
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " »%s«: præference for chifferalgoritme %s\n"
- #: g10/import.c:1042
++#: g10/import.c:1048
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " »%s«: præference for sammendragsalgortime %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " »%s«: præference for komprimeringsalgortime %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "det anbefales på det stærkeste, at du opdaterer dine præferencer og\n"
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"gendistribuerer denne nøgle for at undgå potentielle problemer med rod i\n"
"algoritmen\n"
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "du kan opdatere dine præferencer med: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, c-format
msgid "key %s: no user ID\n"
msgstr "nøgle %s: ingen bruger-id\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "udelod »%s«: %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1264
++#: g10/import.c:1343
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "nøgle %s: korruption af PKS-undernøgle er repareret!\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "nøgle %s: accepteret ikke egenunderskrevet bruger-id »%s«\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "nøgle %s: ingen gyldige bruger-id'er\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "dette kan skyldes en manglende egenunderskrift\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "nøgle %s: offentlig nøgle blev ikke fundet: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "nøgle %s: ny nøgle - udeladt\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "ingen skrivbar nøglering fundet: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "fejl ved skrivning af nøglering »%s«: %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "nøgle %s: offentlig nøgle »%s« importeret\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "nøgle %s: stemmer ikke med vores kopi\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "nøgle %s: kan ikke lokalisere original nøgleblok: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "nøgle %s: kan ikke læse original nøgleblok: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "nøgle %s: »%s« 1 ny bruger-id\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "nøgle %s: »%s« %d nye bruger-id'er\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "nøgle %s: »%s« 1 ny underskrift\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "nøgle %s: »%s« %d nye underskrifter\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "nøgle %s: »%s« 1 ny undernøgle\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "nøgle %s: »%s« %d nye undernøgler\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "nøgle %s: »%s« %d underskrift renset\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "nøgle %s: »%s« %d underskrifter renset\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "nøgle %s: »%s« %d bruger-id renset\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "nøgle %s: »%s« %d bruger-id'er renset\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "nøgle %s: »%s« ikke ændret\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, c-format
msgid "key %s: secret key imported\n"
msgstr "nøgle %s: hemmelig nøgle importeret\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "udelod: hemmelig nøgle er allerede til stede\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "key %s: error sending to agent: %s\n"
msgstr "fejl under afsendelse af %s-kommando: %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key %s: %s\n"
msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
msgid "importing secret keys not allowed\n"
msgstr "import af hemmelige nøgler er ikke tilladt\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "nøgle %s: hemmelig nøgle med ugyldig chiffer %d - udeladt\n"
@@@ -3688,142 -2887,115 +3663,142 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"nøgle %s: ingen offentlig nøgle - kan ikke anvende tilbagekaldscertifikat\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - afvist\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "nøgle %s: »%s« tilbagekaldscertifikat importeret\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "nøgle %s: ingen bruger-id for underskrift\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"nøgle %s: ikke understøttet offentlig nøglealgoritme på bruger-id »%s«\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "nøgle %s: ugyldig egenunderskrift på bruger-id »%s«\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "nøgle %s: ikke understøttet offentlig nøglealgoritme\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "nøgle %s: ugyldig direkte nøgleunderskrift\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "nøgle %s: ingen undernøgle for nøglebinding\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "nøgle %s: ugyldig undernøglebinding\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "nøgle %s: fjernet flerundernøglebinding\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "nøgle %s: ingen undernøgle for nøgletilbagekald\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "nøgle %s: ugyldig undernøgletilbagekald\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "nøgle %s: fjernet flerundernøgletilbagekald\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "nøgle %s: udeladt bruger-id »%s«\n"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "nøgle %s: udeladt undernøgle\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr ""
"nøgle %s: underskrift der ikke kan eksporteres (klasse 0x%02X) - udeladt\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "nøgle %s: tilbagekaldscertifikat på forkert sted - udeladt\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - udeladt\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "nøgle %s: undernøgleunderskrift på forkert sted - udeladt\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "nøgle %s: uventet underskriftklasse (0x%02X) - udeladt\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "nøgle %s: duplikeret bruger-id detekteret - sammenføjet\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "ADVARSEL: nøgle %s kan tilbagekaldes: henter tilbagekaldsnøgle %s\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"ADVARSEL: nøgle %s kan tilbagekaldes: tilbagekaldsnøgle %s er ikke til "
"stede.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "nøgle %s: »%s« tilbagekaldscertifikat tilføjet\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "nøgle %s: direkte nøgleunderskrift tilføjet\n"
@@@ -4177,8 -3287,6 +4152,8 @@@ msgstr "Jeg har omhyggeligt kontrollere
msgid "Really sign? (y/N) "
msgstr "Underskriv? (j/N) "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "underskrift mislykkedes: %s\n"
@@@ -4654,13 -3660,9 +4629,13 @@@ msgstr "
"Bemærk venligst at den viste nøglevaliditet ikke nødvendigvis er\n"
"korrekt med mindre du genstarter programmet.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
msgid "revoked"
msgstr "tilbagekaldt"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "udløbet"
@@@ -5621,13 -4445,11 +5596,13 @@@ msgstr " Nøglefingeraftryk =
msgid " Card serial no. ="
msgstr " Serielnr. for kort ="
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "mellemlagrer nøglering »%s«\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5635,14 -4457,12 +5610,14 @@@ msgid_plural "%lu keys cached so far (%
msgstr[0] "%lu nøgler mellemlagret indtil nu (%lu underskrifter)\n"
msgstr[1] "%lu nøgler mellemlagret indtil nu (%lu underskrifter)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5650,7 -4470,6 +5625,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 ugyldig underskrift\n"
msgstr[1] "1 ugyldig underskrift\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: nøglering oprettet\n"
@@@ -5868,118 -4642,99 +5843,124 @@@ msgstr "uafhængig tilbagekald - brug �
msgid "no signature found\n"
msgstr "ingen underskrift fundet\n"
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, c-format
msgid "BAD signature from \"%s\""
msgstr "UGYLDIG underskrift fra »%s«"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Udløbet underskrift fra »%s«"
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, c-format
msgid "Good signature from \"%s\""
msgstr "God underskrift fra »%s«"
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "underskriftverificering undertrykt\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
msgid "can't handle this ambiguous signature data\n"
msgstr "kan ikke håndtere disse tvetydige underskriftdata\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, c-format
msgid "Signature made %s\n"
msgstr "Underskrift lavet %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, c-format
msgid " using %s key %s\n"
msgstr " bruger %s nøgle %s\n"
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Underskrift lavet %s med %s nøgle-id %s\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ #| msgid " aka \"%s\""
+ msgid " issuer \"%s\"\n"
+ msgstr " også kendt som »%s«"
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "Nøgle tilgængelig på: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[usikker]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, c-format
msgid " aka \"%s\""
msgstr " også kendt som »%s«"
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "Underskrift udløbet %s\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "Underskrift udløber %s\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s underskrift, sammendragsalgoritme %s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "binær"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "tekstilstand"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "ukendt"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algoritme: %s"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Kan ikke kontrollere underskrift: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "ikke en frakoblet underskrift\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"ADVARSEL: flere underskrifter detekteret. Kun den første vil blive "
"kontrolleret.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "uafhængig underskrift for klasse 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "gammeldags (PGP 2.x) underskrift\n"
@@@ -6167,59 -4887,20 +6148,25 @@@ msgstr "ADVARSEL: potentiel usikker sym
msgid "subpacket of type %d has critical bit set\n"
msgstr "underpakke af typen %d har kritiske bitsæt\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, c-format
msgid "problem with the agent: %s\n"
msgstr "problem med agenten: %s\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, c-format
- msgid " (main key ID %s)"
- msgstr " (hovednøgle-id %s)"
-
- #: g10/passphrase.c:277
- #, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Indtast venligst adgangsfrasen til at åbne den hemmelige nøgle for OpenPGP-"
- "certifikatet:\n"
- "\"%.*s\"\n"
- "%u-bit %s nøgle, id %s,\n"
- "oprettet %s%s.\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Indtast adgangsfrase\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "afbrudt af bruger\n"
- #: g10/passphrase.c:483
- #, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "Du skal bruge en adgangsfrase til at åbne den hemmelige\n"
- "nøgle for bruger: »%s«\n"
-
- #: g10/passphrase.c:491
- #, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%u-bit %s nøgle, id %s, oprettet %s"
-
- #: g10/passphrase.c:500
++#: g10/passphrase.c:489
#, c-format
- msgid " (subkey on main key ID %s)"
- msgstr " (undernøgle på hovednøgle-id %s)"
+ msgid " (main key ID %s)"
+ msgstr " (hovednøgle-id %s)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
#, fuzzy
#| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
@@@ -6227,37 -4908,31 +6174,37 @@@ msgstr "
"Indtast venligst adgangsfrasen for at fjerne beskyttelsen på PKCS#12-"
"objektet."
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, fuzzy, c-format
#| msgid "%u-bit %s key, ID %s, created %s"
msgid ""
@@@ -6457,135 -5097,108 +6404,135 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "Brug denne nøgle alligevel? (j/N) "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "ADVARSEL: Bruger nøgle uden troværdighed!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr ""
"ADVARSEL: Denne nøgle kan tilbagekaldes (tilbagekaldsnøgle er ikke til "
"stede)\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr ""
"ADVARSEL: Denne nøgle er blevet tilbagekaldt af dens designmæssige "
"tilbagekalder!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "ADVARSEL: Denne nøgle er blevet tilbagekaldt af dets ejer!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
msgid " This could mean that the signature is forged.\n"
msgstr " Dette kan betyde at underskriften er forfalsket.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "ADVARSEL: Denne undernøgle er blevet tilbagekaldt af dens ejer!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Bemærk: Denne nøgle er blevet deaktiveret.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, fuzzy, c-format
#| msgid "Note: Verified signer's address is `%s'\n"
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Bemærk: Verificeret underskriftsejers adresse er »%s«\n"
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, fuzzy, c-format
#| msgid "Note: Signer's address `%s' does not match DNS entry\n"
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "Bemærk: Underskriftejers adresse »%s« matcher ikke DNS-post\n"
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
"troværdighedsniveau justeret til FULL på grund af gyldig PKA-information\n"
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
"troværdighedsniveau justeret til NEVER på grund af ugyldig PKA-information\n"
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Bemærk: Denne nøgle er forældet!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
"ADVARSEL: Denne nøgle er ikke certificeret med en troværdig underskrift!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Intet tyder på at denne signatur tilhører ejeren.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ADVARSEL: Vi tror IKKE på denne nøgle!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " Signaturen er formentlig FORFALSKET.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"ADVARSEL: Denne nøgle er ikke certificeret med tilstrækkelig troværdige "
"underskrifter!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
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:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: udelod: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: udelod: offentlig nøgle er slået fra\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: udelod: offentlig nøgle er allerede til stede\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, 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:991
++#: g10/pkclist.c:995
#, 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:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr "Aktuelle modtagere:\n"
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6593,37 -5206,29 +6540,37 @@@ msgstr "
"\n"
"Indtast bruger-id'et. Slut med en tom linje: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Ingen sådan bruger-id.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
msgid "skipped: public key already set as default recipient\n"
msgstr "udeladt: offentlig nøgle er allerede valgt som standardmodtager\n"
- #: g10/pkclist.c:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "Offentlig nøgle er slået fra.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "udelod: offentlig nøgle er allerede angivet\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "ukendt standardmodtager »%s«\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "ingen gyldige adresser\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, 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:1649
++#: g10/pkclist.c:1653
#, 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"
@@@ -6906,7 -5459,6 +6853,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
msgstr[1] "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6987,12 -5530,10 +6934,12 @@@ msgstr "
"ADVARSEL: kan ikke %%-udvide foretrukken nøgleserveradresse (for stor). "
"Bruger uden udvidelse.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s-underskrift fra: »%s«\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -7000,11 -5541,9 +6947,11 @@@ msgstr "
"ADVARSEL: tvang af sammendragsalgoritme %s (%d) overtræder "
"modtagerpræferencer\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "underskriver:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s-kryptering vil blive brugt\n"
@@@ -7112,7 -5631,6 +7059,7 @@@ msgstr "transaktion for trustdb er for
msgid "%s: directory does not exist!\n"
msgstr "%s: mappe findes ikke!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7224,134 -5720,104 +7171,126 @@@ msgstr "kan ikke håndtere tekstlinjer
msgid "input line longer than %d characters\n"
msgstr "inddatalinje er længere end %d tegn\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "fejl under afsendelse af standardtilvalg: %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "ikke understøttet algoritme: %s"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "fejl under afsendelse af %s-kommando: %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "fejl ved skrivning af hemmelig nøglering »%s«: %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: fejl ved skrivning af mappepost: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "fejl ved åbning af »%s«: %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "fejl under afsendelse af %s-kommando: %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "fejl ved indhentelse af ny PIN: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "validitet: %s"
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "fejl ved indhentelse af gemte flag: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "vis nøgler"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%ld message signed"
@@@ -7359,21 -5825,18 +7298,21 @@@ msgid_plural "%ld messages signed
msgstr[0] "vis beskedsammendrag"
msgstr[1] "vis beskedsammendrag"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7383,28 -5846,23 +7322,28 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
#| msgid "error storing flags: %s\n"
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "fejl ved lagring af flag: %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
@@@ -7412,67 -5870,57 +7351,67 @@@ msgstr "fejl ved oprettelse af datakana
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %ld messages signed by \"%s\"."
msgstr "vis beskedsammendrag"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7483,20 -5931,16 +7422,20 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7513,8 -5957,6 +7452,7 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error opening TOFU database: %s\n"
@@@ -8062,7 -6395,6 +8000,7 @@@ msgstr "|N|Oprindelig ny PIN
msgid "run in multi server mode (foreground)"
msgstr "kør i flerservertilstand (forgrund)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|angiv fejlsøgningsniveau til NIVEAU"
@@@ -8120,7 -6441,6 +8058,7 @@@ msgstr "
"Syntaks: scdaemon [tilvalg] kommando [parametre]]\n"
"Smartcard-dæmon for GnuPG\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
#, fuzzy
#| msgid ""
#| "please use the option `--daemon' to run the program in the background\n"
@@@ -8128,12 -6448,10 +8066,12 @@@ msgid "please use the option '--daemon
msgstr ""
"brug venligst tilvalget »--daemon« til at køre programmet i baggrunden\n"
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr "håndtering for fd %d startet\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "håndtering for fd %d termineret\n"
@@@ -8237,12 -6532,10 +8175,12 @@@ msgstr "sikr dig at »dirmngr« er korr
msgid "checking the CRL failed: %s"
msgstr "kontrol af CRL'en mislykkedes: %s"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr "certifikat med ugyldig validitet: %s"
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr "certifikat er endnu ikke gyldigt"
@@@ -8254,7 -6545,6 +8192,7 @@@ msgstr "rodcertifikat er endnu ikke gyl
msgid "intermediate certificate not yet valid"
msgstr "mellemliggende certifikat er endnu ikke gyldigt"
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
msgid "certificate has expired"
msgstr "certifikat er udløbet"
@@@ -8304,7 -6583,6 +8242,7 @@@ msgstr " (certifikat gyldigt fra
msgid " ( issuer valid from "
msgstr " ( udsteder gyldig fra "
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, c-format
msgid "fingerprint=%s\n"
msgstr "fingeraftryk=%s\n"
@@@ -8335,7 -6607,6 +8273,7 @@@ msgstr "ingen udsteder fundet i certifi
msgid "self-signed certificate has a BAD signature"
msgstr "egenunderskrevet certifikat har en UGYLDIG underskrift"
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr "rodcertifikat er ikke markeret som troværdig"
@@@ -8344,28 -6614,22 +8282,28 @@@
msgid "checking the trust list failed: %s\n"
msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr "certifikatkæde er for lang\n"
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr "udstedercertifikat blev ikke fundet"
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
msgid "certificate has a BAD signature"
msgstr "certifikat har en UGYLDIG underskrift"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr "fandt et andet mulig matchende CA-certifikat - prøver igen"
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr "certifikatkæde er længere end tilladt af CA (%d)"
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
msgid "certificate is good\n"
msgstr "certifikat er gyldigt\n"
@@@ -8395,7 -6653,6 +8333,7 @@@ msgstr "en %u-bit-hash er ikke gyldig f
msgid "(this is the MD2 algorithm)\n"
msgstr "(dette er MD2-algoritmen)\n"
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
msgid "none"
msgstr "ingen"
@@@ -8430,36 -6682,28 +8368,36 @@@ msgstr "
"S/N %s, id 0x%08lX,\n"
"oprettet %s, udløber %s.\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr "ingen nøglebrug angivet - antager alle mulige brug\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "fejl ved indhentelse af nøglebrugsinformation: %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr "certifikat burde ikke være brugt for certificering\n"
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr "certifikat burde ikke være brugt for OCSP-svarunderskrivning\n"
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr "certifikat burde ikke være brugt for kryptering\n"
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr "certifikat burde ikke være brugt for underskrift\n"
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr "certifikat kan ikke bruges til kryptering\n"
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr "certifikat kan ikke bruges til underskrivning\n"
@@@ -8910,23 -7064,19 +8848,23 @@@ msgstr "%s:%u: adgangskode angivet ude
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: udelader denne linje\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
msgid "could not parse keyserver\n"
msgstr "kunne ikke fortolke nøgleserver\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, 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:1673
++#: sm/gpgsm.c:1670
#, 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:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr "ugyldig kommando (der er ingen implict kommando)\n"
@@@ -8987,7 -7125,6 +8925,7 @@@ msgstr "problem under gensøgning af ce
msgid "error storing flags: %s\n"
msgstr "fejl ved lagring af flag: %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr "Fejl - "
@@@ -9119,112 -7235,87 +9057,106 @@@ msgstr "problem under udkig efter eksis
msgid "dropping %u certificates from the cache\n"
msgstr "slår udsteder op fra Dirmngr-mellemlageret\n"
- #: dirmngr/certcache.c:352
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
- msgid "can't access directory '%s': %s\n"
- msgstr "kan ikke oprette mappe »%s«: %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't parse certificate '%s': %s\n"
msgstr "kan ikke oprette »%s«: %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, fuzzy, c-format
#| msgid "certificate `%s' deleted\n"
msgid "certificate '%s' already cached\n"
msgstr "certifikat »%s« slettet\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, fuzzy, c-format
#| msgid "duplicated certificate `%s' deleted\n"
msgid "trusted certificate '%s' loaded\n"
msgstr "duplikeret certifikat »%s« slettet\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, fuzzy, c-format
#| msgid "certificate `%s' deleted\n"
msgid "certificate '%s' loaded\n"
msgstr "certifikat »%s« slettet\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, fuzzy, c-format
#| msgid "fingerprint=%s\n"
msgid " SHA1 fingerprint = %s\n"
msgstr "fingeraftryk=%s\n"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error loading certificate '%s': %s\n"
msgstr "fejl ved lagring af certifikat: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, fuzzy, c-format
#| msgid "Included certificates"
msgid "permanently loaded certificates: %u\n"
msgstr "Inkluderede certifikater"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, fuzzy, c-format
#| msgid "number of matching certificates: %d\n"
msgid " runtime cached certificates: %u\n"
msgstr "antallet af matchende certifikater: %d\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
#, fuzzy
#| msgid " (certificate created at "
msgid "certificate already cached\n"
msgstr " (certifkat oprettet den "
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate cached\n"
msgstr "certifikat er gyldigt\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error caching certificate: %s\n"
msgstr "fejl ved lagring af certifikat: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "ugyldig fingeraftryk"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error fetching certificate by S/N: %s\n"
msgstr "fejl ved lagring af certifikat: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error fetching certificate by subject: %s\n"
msgstr "fejl ved lagring af certifikat: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
#, fuzzy
#| msgid "no issuer found in certificate"
msgid "no issuer found in certificate\n"
msgstr "ingen udsteder fundet i certifikat"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error getting authorityKeyIdentifier: %s\n"
@@@ -9511,7 -7551,6 +9443,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "fejl ved indhentelse af gemte flag: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
@@@ -9532,7 -7568,6 +9464,7 @@@ msgstr "
msgid "converting S-expression failed: %s\n"
msgstr "iconv_open mislykkedes: %s:\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, fuzzy, c-format
#| msgid "receiving line failed: %s\n"
msgid "creating S-expression failed: %s\n"
@@@ -9967,128 -7922,95 +9899,122 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:159
- #, fuzzy
- #| msgid "run in daemon mode (background)"
- msgid "run as windows service (background)"
- msgstr "kør i dæmontilstand (baggrunden)"
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
#, 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:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "send en kommando til dirmngr'en"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr "|FILE|skriv servertilstandslogge til FIL"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "Afslut uden at gemme? (j/N) "
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "tillad PKA-opslag (DNS-forespørgsler)"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
#, 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:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 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:209
++#: dirmngr/dirmngr.c:196
#, fuzzy
#| msgid "|URL|use keyserver at URL"
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|brug nøgleserver på adressen"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10101,13 -8023,11 +10027,13 @@@ msgstr "
"@\n"
"(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10119,88 -8039,71 +10045,88 @@@ msgstr "
"Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
"Hemmelig nøglehåndtering for GnuPG\n"
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, fuzzy, c-format
#| msgid "invalid debug-level `%s' given\n"
msgid "valid debug levels are: %s\n"
msgstr "ugyldigt fejlsøgningsniveau »%s« angivet\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "brug: gpgsm [tilvalg] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
#, 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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, 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:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, 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:1594
++#: dirmngr/dirmngr.c:1418
#, 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:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "ugyldig fingeraftryk"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, 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:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "ikke tvunget"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10573,115 -8406,94 +10499,115 @@@ msgstr "kontrol af troværdighedsliste
msgid "not signed by a default OCSP signer's certificate"
msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, fuzzy, c-format
#| msgid "receiving line failed: %s\n"
msgid "allocating list item failed: %s\n"
msgstr "modtagelse af linje mislykkedes: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error getting responder ID: %s\n"
msgstr "fejl ved indhentelse af ny PIN: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
#, fuzzy
#| msgid "certificate should not have been used for OCSP response signing\n"
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr "certifikat burde ikke være brugt for OCSP-svarunderskrivning\n"
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, fuzzy, c-format
#| msgid "issuer certificate not found"
msgid "issuer certificate not found: %s\n"
msgstr "udstedercertifikat blev ikke fundet"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
#, fuzzy
#| msgid "error reading list of trusted root certificates\n"
msgid "caller did not return the target certificate\n"
msgstr "fejl ved læsning af liste over betroede rodcertifikater\n"
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
#, fuzzy
#| msgid "error storing certificate\n"
msgid "caller did not return the issuing certificate\n"
msgstr "fejl ved lagring af certifikat\n"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, fuzzy, c-format
#| msgid "failed to allocate keyDB handle\n"
msgid "failed to allocate OCSP context: %s\n"
msgstr "kunne ikke allokere keyDB-håndtag\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't get authorityInfoAccess: %s\n"
msgstr "kan ikke tilgå »%s«: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
#, fuzzy
#| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
msgstr "ingen hemmelig standardnøglering: %s\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, fuzzy, c-format
#| msgid "using default PIN as %s\n"
msgid "using default OCSP responder '%s'\n"
msgstr "bruger standard-PIN som %s\n"
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, fuzzy, c-format
#| msgid "using cipher %s\n"
msgid "using OCSP responder '%s'\n"
msgstr "bruger chiffer %s\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "fejl ved lagring af certifikat: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, fuzzy, c-format
#| msgid "certificate has been revoked"
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "certifikat er blevet tilbagekaldt"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr ""
@@@ -10735,36 -8537,30 +10661,36 @@@ msgstr "select mislykkedes: %s\n
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, 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:2415
++#: dirmngr/server.c:2377
#, 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:2436
++#: dirmngr/server.c:2398
#, 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:2444
++#: dirmngr/server.c:2406
#, 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:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10792,39 -8584,29 +10718,35 @@@ msgstr "
msgid "checking CRL for"
msgstr "kontrol af CRL'en mislykkedes: %s"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
#, fuzzy
#| msgid "self-signed certificate has a BAD signature"
msgid "selfsigned certificate has a BAD signature"
msgstr "egenunderskrevet certifikat har en UGYLDIG underskrift"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, fuzzy, c-format
#| msgid "checking for qualified certificate failed: %s\n"
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "kontrollerer for kvalificeret certifikat mislykkedes: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate chain is good\n"
msgstr "certifikat er gyldigt\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr ""
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
#, fuzzy
#| msgid "certificate should not have been used for signing\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:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
msgid "quiet"
msgstr "stille"
@@@ -10961,11 -8712,9 +10883,11 @@@ msgstr "|N|angive maksimal livsforløb
msgid "Options enforcing a passphrase policy"
msgstr "Tilvalg der fremtvinger en adgangsfrasepolitik"
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr "tillad ikke omgåelse af adgangsfrasepolitikken"
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|angiv minimal krævet længde for nye adgangsfraser til N"
@@@ -11106,77 -8823,61 +11028,77 @@@ msgstr "Ekstern verifikation af kompone
msgid "Note that group specifications are ignored\n"
msgstr "Bemærk at gruppespecifikationer ignoreres\n"
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr "vis alle komponenter"
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr "kontroller alle programmer"
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr "|COMPONENT|vis indstillinger"
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr "|COMPONENT|ændr indstillinger"
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr "|COMPONENT|kontroller indstillinger"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr "anvend globale standardværdier"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
#, fuzzy
#| msgid "get the configuration directories for gpgconf"
msgid "get the configuration directories for @GPGCONF@"
msgstr "hent konfigurationsmapperne for gpgconf"
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
msgid "list global configuration file"
msgstr "vis global konfigurationsfil"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
msgid "check global configuration file"
msgstr "kontroller global konfigurationsfil"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
#, fuzzy
#| msgid "list all components"
msgid "reload all or a given component"
msgstr "vis alle komponenter"
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
#, fuzzy
#| msgid "list all components"
msgid "launch a given component"
msgstr "vis alle komponenter"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
#, fuzzy
#| msgid "list all components"
msgid "kill a given component"
msgstr "vis alle komponenter"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "brug som uddatafil"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr "aktiver ændringer ved kørselstid, hvis muligt"
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
#, 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:119
++#: tools/gpgconf.c:121
#, fuzzy
#| msgid ""
#| "Syntax: gpgconf [options]\n"
@@@ -11188,15 -8889,12 +11110,15 @@@ msgstr "
"Syntaks: gpgconf [tilvalg]\n"
"Håndter konfigurationsindstillinger for værktøjer i GnuPG-systemet\n"
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr "Kræver en kompomentparameter"
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
msgid "Component not found"
msgstr "Komponent blev ikke fundet"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
msgid "No argument allowed"
msgstr "Ingen parameter tilladt"
@@@ -11248,123 -8937,98 +11170,123 @@@ msgstr "
"[tilvalg ...] KOMMANDO [inddatafil]\n"
"Kald et simpelt symmetrisk krypteringsværktøj\n"
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s på %s afbrudt med status %i\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, c-format
msgid "%s on %s failed with status %i\n"
msgstr "%s på %s mislykkedes med status %i\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, fuzzy, c-format
#| msgid "can't create temporary directory `%s': %s\n"
msgid "can't create temporary directory '%s': %s\n"
msgstr "kan ikke oprette midlertidig mappe »%s«: %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr "kunne ikke åbne %s for skrivning: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, c-format
msgid "error writing to %s: %s\n"
msgstr "fejl ved skrivning til »%s«: %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, c-format
msgid "error reading from %s: %s\n"
msgstr "fejl ved læsning fra %s: %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, c-format
msgid "error closing %s: %s\n"
msgstr "fejl ved lukning af %s: %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
msgid "no --program option provided\n"
msgstr "tilvalget --program blev ikke leveret\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr "kun --decrypt og --encrypt er understøttet\n"
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr "tilvalget --keyfile blev ikke leveret\n"
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr "kan ikke allokere parametervektor\n"
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, c-format
msgid "could not create pipe: %s\n"
msgstr "kunne ikke oprette datakanal: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, c-format
msgid "could not create pty: %s\n"
msgstr "kunne ikke oprette pty: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr "kunne ikke forgrene: %s\n"
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, c-format
msgid "execv failed: %s\n"
msgstr "execv mislykkedes: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, c-format
msgid "select failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, c-format
msgid "read failed: %s\n"
msgstr "læsning mislykkedes: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, c-format
msgid "pty read failed: %s\n"
msgstr "pty-læsning mislykkedes: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, c-format
msgid "waitpid failed: %s\n"
msgstr "waitpid mislykkedes: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr "underproces afbrudt med status %i\n"
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "kan ikke allokere infile-streng: %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "kan ikke allokere outfile-streng: %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr "enten %s eller %s skal være angivet\n"
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr "ingen klasse angivet\n"
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, c-format
msgid "class %s is not supported\n"
msgstr "klasse %s er ikke understøttet\n"
diff --cc po/de.po
index d918d04,71e5700..c98cdd5
--- a/po/de.po
+++ b/po/de.po
@@@ -9,8 -9,7 +9,8 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg-2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
- "PO-Revision-Date: 2016-07-14 15:55+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
+ "PO-Revision-Date: 2016-08-18 16:52+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@@ -107,13 -91,9 +107,13 @@@ msgstr "
msgid "PIN:"
msgstr "PIN:"
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
msgid "Passphrase:"
msgstr "Passphrase:"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr "Keine Übereinstimmung - bitte nochmal versuchen."
@@@ -153,64 -125,42 +153,64 @@@ msgstr "Falsche PIN!
msgid "Bad Passphrase"
msgstr "Falsche Passphrase!"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, c-format
msgid "can't create '%s': %s\n"
msgstr "'%s' kann nicht erzeugt werden: %s\n"
- #: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, c-format
msgid "can't open '%s': %s\n"
msgstr "'%s' kann nicht geöffnet werden: %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "Fehler beim Holen der Karten-Seriennummer: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "Erkannte Karte hat die Seriennummer: %s\n"
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "Auf der Karte ist kein Authentisierungsschlüssel für SSH: %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "keine passender Kartenschlüssel gefunden: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, c-format
msgid "shadowing the key failed: %s\n"
msgstr "\"Shadowing\" des Schlüssels schlug fehl: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, c-format
msgid "error writing key: %s\n"
msgstr "Fehler beim Schreiben des Schlüssels: %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -219,26 -169,21 +219,26 @@@ msgstr "
"Ein SSH Processs möchte folgenden Schlüssel verwenden:%%0A %s%%0A "
"(%s)%%0AErlauben Sie dies?"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr "Erlauben"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr "Verweigern"
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr ""
"Bitte geben Sie die Passphrase für den SSH-Schlüssel%%0A %F%%0A "
"(%c)%%0Aein."
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Bitte geben Sie die Passphrase noch einmal ein:"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -248,7 -193,6 +248,7 @@@ msgstr "
"Schlüssel%%0A %s%%0A %s%%0Aim Schlüsselspeicher des Gpg-Agenten zu "
"schützen."
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "Das Erzeugen eines Datenstroms aus dem Socket schlug fehl: %s\n"
@@@ -390,8 -308,6 +390,8 @@@ msgstr "Bitte geben Sie die Passphrase
msgid "Please enter the new passphrase"
msgstr "Bitte geben Sie die Passphrase ein:"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -399,130 -315,92 +399,130 @@@ msgstr "
"@Optionen:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr "Im Daemon Modus ausführen"
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr "Im Server Modus ausführen"
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "Detaillierte Informationen"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "Reduzierte Informationen"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr "Ausgabe für /bin/sh"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr "Ausgabe für /bin/csh"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr "Im Vordergrund laufen lassen"
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr "Tastatur und Maus nicht \"grabben\""
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "Logausgaben in eine Datei umlenken"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|Benutze PGM as PIN-Entry"
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|Benutze PGM als SCdaemon"
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
msgid "do not use the SCdaemon"
msgstr "Den SCdaemon-basierten Kartenzugriff nicht nutzen"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|Einige Kommandos über NAME annehmen"
- #: agent/gpg-agent.c:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr "Ignoriere Anfragen, das TTY zu wechseln"
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr "Ignoriere Anfragen, das X-Display zu wechseln"
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|Lasse PINs im Cache nach N Sekunden verfallen"
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr "Benutze PINs im Cache nicht beim Signieren"
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
msgid "disallow the use of an external password cache"
msgstr "Verbiete die Verwendung eines externen Passwordmanagers"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr "Verbiete Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
msgid "allow presetting passphrase"
msgstr "Erlaube ein \"preset\" von Passphrases"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr "Aufrufer darf das Pinentry nicht ersetzen"
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr "Erlaube die Eingabe einer Passphrase über Emacs"
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
msgid "enable ssh support"
msgstr "SSH Unterstützung einschalten"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Berichte über Programmfehler bitte in englisch an <@EMAIL@>.\n"
"Sinn- oder Schreibfehler in den deutschen Texten bitte an <de at li.org>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Gebrauch: @GPG_AGENT@ [Optionen] [Kommando [Argumente]]"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -530,107 -408,72 +530,99 @@@ msgstr "
"Syntax: @GPG_AGENT@ [Optionen] [Befehl [Argumente]]\n"
"Verwaltung von geheimen Schlüsseln für @GNUPG@\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "ungültige Debugebene `%s' angegeben\n"
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, 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"
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, c-format
msgid "option file '%s': %s\n"
msgstr "Optionendatei '%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, c-format
msgid "reading options from '%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Hinweis: `%s' wird nicht als Option betrachtet\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, c-format
msgid "can't create socket: %s\n"
msgstr "Socket kann nicht erzeugt werden: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "Der Name des Sockets `%s' ist zu lang\n"
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
msgid "error getting nonce for the socket\n"
msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, 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:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, 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:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, c-format
msgid "listen() failed: %s\n"
msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, c-format
msgid "listening on socket '%s'\n"
msgstr "Es wird auf Socket `%s' gehört\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
- #: agent/gpg-agent.c:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "Verzeichnis `%s' erzeugt\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
#, 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:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "Fehler beim Lesen der \"Nonce\" von FD %d: %s\n"
@@@ -645,28 -486,22 +637,28 @@@ msgstr "Handhabungsroutine 0x%lx für f
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "Handhabungsroutine 0x%lx für den fd %d beendet\n"
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, 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:2390
++#: agent/gpg-agent.c:2392
#, 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:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s angehalten\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "Der gpg-agent läuft nicht für diese Session\n"
@@@ -682,8 -515,6 +674,8 @@@ msgstr "
"Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
"Kennwortpuffer-Pflege\n"
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -691,9 -522,6 +683,9 @@@ msgstr "
"@Befehle:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -715,16 -541,13 +707,16 @@@ msgstr "
"Syntax: gpg-protect-tool [Optionen] [Argumente]\n"
"Werkzeug zum Bearbeiten von geheimen Schlüsseln\n"
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Bitte geben Sie die Passphrase zum Entsperren des PKCS#12 Objekts ein."
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr ""
"Bitte geben Sie die Passphrase zum Schützen des neuen PKCS#12 Objekts ein."
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
@@@ -732,7 -555,6 +724,7 @@@ msgstr "
"Bitte geben Sie die Passphrase ein, um das importierte Objekt im GnuPG "
"System zu schützen."
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -740,16 -562,13 +732,16 @@@ msgstr "
"Die Eingabe der Passphrase bzw. der PIN\n"
"wird benötigt, um diese Aktion auszuführen."
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
msgid "cancelled\n"
msgstr "Vom Benutzer abgebrochen\n"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, c-format
msgid "error opening '%s': %s\n"
msgstr "Fehler beim Öffnen von `%s': %s\n"
@@@ -931,42 -721,30 +923,42 @@@ msgstr "Schutzverfahren %d (%s) wird ni
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "Schutzverfahrenshash %d (%s) wird nicht unterstützt\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "Fehler beim Erzeugen eines \"streams\" zu einer \"pipe\": %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, c-format
msgid "error forking process: %s\n"
msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "Das Warten auf die Beendigung von Prozessen schlug fehl: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr "Fehler bei Ausführung von `%s': wahrscheinlich nicht installiert\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, c-format
msgid "error running '%s': terminated\n"
msgstr "Fehler bei Ausführung von `%s': beendet\n"
@@@ -981,33 -757,13 +973,16 @@@ msgstr "Fehler beim Holen des Exitwert
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "Das Warten auf die Beendigung des Prozesses %d schlug fehl: %s\n"
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "Kommunikationsproblem mit GPG-Agent\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
msgid "problem setting the gpg-agent options\n"
msgstr "Beim Setzen der gpg-agent Optionen ist ein Problem aufgetreten\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- msgid "canceled by user\n"
- msgstr "Vom Benutzer abgebrochen\n"
-
- #: common/simple-pwquery.c:579
- msgid "problem with the agent\n"
- msgstr "Problem mit dem Agenten\n"
-
- #: common/simple-pwquery.c:701
- #, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "Problem mit dem Agenten (unerwartete Antwort \"%s\")\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
@@@ -1093,7 -832,6 +1068,7 @@@ msgstr "%s:%u: Die Option \"%s\" is ver
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "WARNUNG: \"%s%s\" ist eine veraltete Option - sie hat keine Wirkung.\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr "Unbekanntes Debug Flag '%s' wird ignoriert\n"
@@@ -1116,17 -850,14 +1091,17 @@@ msgstr "Verbindung zum gpg-agent aufgeb
msgid "connection to agent is in restricted mode\n"
msgstr "Verbindung zum gpg-agent ist im eingeschränkten Modus.\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr "Kein aktiver Dirmngr - `%s' wird gestartet\n"
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "Warte bis der Dirmngr bereit ist ... (%ds)\n"
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr "Verbindung zum Dirmngr aufgebaut\n"
@@@ -1384,7 -1055,6 +1359,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:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
msgid "out of core\n"
msgstr "Nicht genügend Speicher\n"
@@@ -1442,7 -1101,10 +1417,13 @@@ msgstr "Dateisperre %s konnte nicht ein
msgid "waiting for lock %s...\n"
msgstr "Warten auf die Freigabe der Dateisperre `%s' ...\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, 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"
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "ASCII-Hülle: %s\n"
@@@ -1674,10 -1281,6 +1655,10 @@@ msgstr "URL um den öffentlichen Schlü
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Fehler: URL ist zu lang (Grenze beträgt %d Zeichen).\n"
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, c-format
msgid "error reading '%s': %s\n"
msgstr "Fehler beim Lesen von `%s': %s\n"
@@@ -1965,26 -1503,17 +1946,26 @@@ msgstr "Admin-Befehle sind nicht erlaub
msgid "Invalid command (try \"help\")\n"
msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output funktioniert nicht bei diesem Befehl\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "'%s' kann nicht geöffnet werden\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "Fehler beim Lesen des Schlüsselblocks: %s\n"
@@@ -2044,38 -1561,31 +2025,38 @@@ msgstr "
"Verwenden Sie zunächst den Befehl \"--delete-secret-key\", um ihn zu "
"entfernen.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr ""
"Aufgrund des S2K-Modus kann ein symmetrisches ESK Paket nicht benutzt "
"werden\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "benutze Cipher %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, c-format
msgid "'%s' already compressed\n"
msgstr "`%s' ist bereits komprimiert\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, c-format
msgid "reading from '%s'\n"
msgstr "Lesen von '%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2083,7 -1593,6 +2064,7 @@@ msgstr "
"WARNUNG: Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren "
"%s (%d) verletzt die Empfängervoreinstellungen\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2092,19 -1601,16 +2073,19 @@@ msgstr "
"WARNUNG: Erzwungenes Kompressionsverfahren %s (%d) verletzt die "
"Empfängervoreinstellungen.\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %s (%d) "
"verletzt die Empfängervoreinstellungen\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s verschlüsselt für: %s\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
@@@ -2209,8 -1694,6 +2190,8 @@@ msgstr "Während des Exports soviel wi
msgid " - skipped"
msgstr " - übersprungen"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, c-format
msgid "writing to '%s'\n"
msgstr "Schreiben nach '%s'\n"
@@@ -2243,8 -1719,6 +2224,8 @@@ msgstr "Fehler beim Erstellen von `%s'
msgid "[User ID not found]"
msgstr "[User-ID nicht gefunden]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(Prüfe das Argument der Option '%s')\n"
@@@ -2313,199 -1774,150 +2294,199 @@@ msgstr "
msgid "using subkey %s instead of primary key %s\n"
msgstr "der Unterschlüssel %s wird anstelle des Hauptschlüssels %s verwendet\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
msgid "make a signature"
msgstr "Eine Signatur erzeugen"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
msgid "make a clear text signature"
msgstr "Eine Klartextsignatur erzeugen"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "Eine abgetrennte Signatur erzeugen"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "Daten verschlüsseln"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "Daten symmetrisch verschlüsseln"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "Daten entschlüsseln (Voreinstellung)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "Signatur prüfen"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "Liste der Schlüssel"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "Liste der Schlüssel und ihrer Signaturen"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "list and check key signatures"
msgstr "Signaturen der Schlüssel auflisten und prüfen"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "Liste der geheimen Schlüssel"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "Ein neues Schlüsselpaar erzeugen"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
msgid "quickly generate a new key pair"
msgstr "Schnell ein neues Schlüsselpaar erzeugen"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
msgid "quickly add a new user-id"
msgstr "Schnell eine neue User-ID anfügen"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
msgid "quickly revoke a user-id"
msgstr "Schnell eine User-ID widerrufen"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr "Ein neues Schlüsselpaar erzeugen (alle Optionen)"
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
msgid "quickly sign a key"
msgstr "Schlüssel schnell signieren"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
msgid "quickly sign a key locally"
msgstr "Schlüssel schnell nur für diesen Rechner signieren"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "Schlüssel signieren"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "Schlüssel nur für diesen Rechner signieren"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "Signieren oder bearbeiten eines Schlüssels"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "Die Passphrase ändern"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "Schlüssel exportieren"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "Schlüssel zu einem Schlü.server exportieren"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "Schlüssel von einem Schlü.server importieren"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "Schlüssel auf einem Schlü.server suchen"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "alle Schlüssel per Schlü.server aktualisieren"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "Schlüssel importieren/kombinieren"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr "den Karten-Status ausgeben"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr "Daten auf einer Karte ändern"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr "PIN einer Karte ändern"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "Ändern der \"Trust\"-Datenbank"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
msgid "print message digests"
msgstr "Hashwerte für die Dateien ausgeben"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "Im Server Modus ausführen"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|WERT|Setze die TOFU-Politik für einen Schlüssel"
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "Ausgabe mit ASCII-Hülle versehen"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|Verschlüsseln für USER-ID"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|Mit USER-ID signieren bzw. entschlüsseln"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|Kompressionsstufe auf N setzen (0=keine)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "Textmodus benutzen"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|DATEI|Ausgabe auf DATEI schreiben"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "Keine wirklichen Änderungen durchführen"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "vor Überschreiben nachfragen"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr "OpenPGP-Verhalten strikt beachten"
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2514,7 -1926,6 +2495,7 @@@ msgstr "
"(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
"Optionen)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2534,11 -1945,9 +2515,11 @@@ msgstr "
" --list-keys [Namen] Schlüssel anzeigen\n"
" --fingerprint [Namen] \"Fingerabdrücke\" anzeigen\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Aufruf: @GPG@ [Optionen] [Dateien] (-h für Hilfe)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2548,7 -1957,6 +2529,7 @@@ msgstr "
"Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
"Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2556,74 -1964,59 +2537,74 @@@ msgstr "
"\n"
"Unterstützte Verfahren:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "Öff. Schlüssel: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Verschlü.: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Komprimierung: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "Aufruf: %s [Optionen] %s\n"
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "Widersprüchliche Befehle\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses für Home-"
"Verzeichnis `%s'\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2631,20 -2024,17 +2612,20 @@@ msgstr "
"WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
"Konfigurationsdatei '%s'\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses `%s'\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses des Home-"
"Verzeichnisses `%s'\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2652,508 -2042,390 +2633,501 @@@ msgstr "
"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
"Konfigurationsdatei '%s'\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses auf "
"Erweiterung `%s'\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "Unbekanntes Konfigurationselement `%s'\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
msgid "show key usage information during key listings"
msgstr "Schlüsselverwendungszwecke mit den Schlüsseln anlisten"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr "Richtlinien-URL mit den Signaturen anlisten"
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
msgid "show all notations during signature listings"
msgstr "Alle Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr "Standard Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr "Benutzer-Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
msgid "show preferred keyserver URLs during signature listings"
msgstr "Bevorzugten Schlüsselserver mit den Signaturen anlisten"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
msgid "show the keyring name in key listings"
msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
msgid "show expiration dates during signature listings"
msgstr "Das Ablaufdatum mit den Signaturen anlisten"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
msgid "available TOFU policies:\n"
msgstr "Vorhandene TOFU Regeln:\n"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "Unbekannte TOFU Regel '%s'\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr "(\"help\" um mögliche Werte anzuzeigen)\n"
- #: g10/gpg.c:2041
- #, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "Unbekanntes TOFU DB Format '%s'\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr ""
- "Die Bibliothek \"libgcrypt\" ist zu alt (benötigt wird %s, vorhanden ist "
- "%s)\n"
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "`%s' ist kein gültiges Signaturablaufdatum\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, c-format
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "\"%s\" ist keine gültige E-Mailadresse\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "Ungültiger Subjekt-Name '%s'\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "`%s' ist kein gültiger Zeichensatz\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
msgid "invalid keyserver options\n"
msgstr "Ungültige Schlüsselserver-Option\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ungültige Import-Option\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "Ungültige Import-Option\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, c-format
msgid "invalid filter option: %s\n"
msgstr "Ungültige Filter-Option: %s\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ungültige Export-Option.\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "Ungültige Export-Option\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ungültige Listen-Option.\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
msgid "invalid list options\n"
msgstr "Ungültige Listen-Option\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr "Foto-ID während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr "Richtlinien-URLs während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
msgid "show all notations during signature verification"
msgstr "Alle Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr "Standard-Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr "Benutzer-Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"Die URL für den bevorzugten Schlüsselserver während der Signaturprüfung "
"anzeigen"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
msgid "show user ID validity during signature verification"
msgstr "Die Gültigkeit der User-ID während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr "Zeige widerrufene und verfallene User-IDs während der Signaturprüfung"
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
msgid "show only the primary user ID in signature verification"
msgstr "Zeige nur die Haupt-User-ID während der Signaturprüfung"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr "Prüfe Signaturgültigkeit mittels PKA-Daten"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr "Werte das Vertrauen zu Signaturen durch gültige PKA-Daten auf"
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
msgid "invalid verify options\n"
msgstr "Ungültige Überprüfungs-Option\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr "ungültige \"auto-key-locate\"-Liste\n"
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "WARNUNG: %s ersetzt %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s zusammen mit %s ist nicht erlaubt!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "Startet nicht mit unsicherem Speicher, wegen Option %s\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
msgid "selected compression algorithm is invalid\n"
msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed müssen größer als 0 sein\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed müssen größer als 1 sein\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "ungültiger \"default-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ungültiger \"min-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "ungültige Standard-Voreinstellungen\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "ungültige private Hashvoreinstellungen\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "ungültige private Komprimierungsvoreinstellungen\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s arbeitet noch nicht mit %s zusammen\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr ""
"Die Benutzung des Verschlüsselungsverfahren %s ist im %s-Modus nicht "
"erlaubt.\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr ""
"Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"WARNUNG: Empfänger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [Dateiname]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [Dateiname]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [Dateiname]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [Dateiname]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
"--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "Im %s-Modus kann --symmetric --encrypt nicht verwendet werden.\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [Dateiname]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [Dateiname]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [Dateiname]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet "
"werden\n"
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
"Im %s-Modus kann --symmetric --sign --encrypt nicht verwendet werden.\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [Dateiname]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [Dateiname]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [Dateiname]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key User-ID"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key User-ID"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key User-ID [Befehle]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
msgid "--passwd <user-id>"
msgstr "--passwd User-ID"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "Schlüsselexport fehlgeschlagen: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "Schlüsselexport im SSH Format fehlgeschlagen: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "Ungültiges Hashverfahren '%s'\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "Fehler in der Schlüsselangabe '%s': %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
"'%s\" sieht nicht nach einer gültigen Schlüssel-ID, einem Fingerabdruck oder "
"einem \"Keygrip\" aus\n"
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[Dateiname]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Auf geht's - Botschaft eintippen ...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "Die angegebene Signatur-Richtlinien-URL ist ungültig\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
msgid "the given preferred keyserver URL is invalid\n"
msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
@@@ -3194,133 -2458,105 +3168,133 @@@ msgstr "Keine Hilfe vorhanden.
msgid "No help available for '%s'"
msgstr "Keine Hilfe für '%s' vorhanden."
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr "Importiere Signaturen, die als nicht exportfähig markiert sind"
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr "Beseitige Beschädigung durch den Schlüsselserver während des Imports"
- #: g10/import.c:140
++#: g10/import.c:144
msgid "do not clear the ownertrust values during import"
msgstr "die \"Ownertrust\" Werte beim Import nicht löschen"
- #: g10/import.c:143
++#: g10/import.c:147
msgid "do not update the trustdb after import"
msgstr "ändern Sie die \"Trust\"-Datenbank nach dem Import nicht"
- #: g10/import.c:146
++#: g10/import.c:150
msgid "show key during import"
msgstr "Schlüssel beim Import anzeigen"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr "Nur Änderungen bereits existierender Schlüssel vornehmen"
- #: g10/import.c:152
++#: g10/import.c:156
msgid "remove unusable parts from key after import"
msgstr "entferne nach dem Import unbrauchbare Teile des Schlüssels"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr "nach dem Import soviel wie möglich aus dem Schlüssel entfernen"
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr "Import-Filter anwenden und Schlüssel direkt exportieren"
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "überspringe den Block vom Typ %d\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu Schlüssel bislang bearbeitet\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " ignorierte PGP-2 Schlüssel: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ignorierte neue Schlüssel: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ohne User-ID: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importiert: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " unverändert: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " neue User-IDs: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " neue Unterschlüssel: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " neue Signaturen: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " neue Schlüsselwiderrufe: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " gelesene geheime Schlüssel: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " geheime Schlüssel importiert: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " unveränderte geh. Schl.: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " nicht importiert: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " Signaturen bereinigt: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " User-IDs bereinigt: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3329,191 -2565,153 +3303,191 @@@ msgstr "
"WARNUNG: Schlüssel %s hat Einstellungen zu nicht verfügbaren\n"
"Verfahren für folgende User-ID:\n"
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": Einstellungen des Verschlüsselungsverfahren %s\n"
- #: g10/import.c:1042
++#: g10/import.c:1048
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": Einstellungen der Hashmethode %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": Einstellungen der Komprimierungsverfahren %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "es ist extrem empfehlenswert Ihre Einstellungen zu ändern und\n"
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"diesen Schlüssel wieder zu verteilen, um mögliche Probleme durch unpassende "
"Verfahrenskombinationen zu vermeiden\n"
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"Sie können Ihren Einstellungen mittels \"gpg --edit-key %s updpref save\" "
"ändern\n"
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, c-format
msgid "key %s: no user ID\n"
msgstr "Schlüssel %s: Keine User-ID\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, c-format
msgid "key %s: %s\n"
msgstr "Schlüssel %s: %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr "vom Import-Aufpasser zurückgewiesen"
- #: g10/import.c:1264
++#: g10/import.c:1343
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "Schlüssel %s: PKS Unterschlüsseldefekt repariert\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "Schlüssel %s: Nicht eigenbeglaubigte User-ID `%s' übernommen\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "Schlüssel %s: Keine gültigen User-IDs\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "dies könnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "Schlüssel %s: Öffentlicher Schlüssel nicht gefunden: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "Schlüssel %s: neuer Schlüssel - übersprungen\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "Schlüssel %s: Öffentlicher Schlüssel \"%s\" importiert\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "Schlüssel %s: Stimmt nicht mit unserer Kopie überein\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "Schlüssel %s: der originale Schlüsselblock wurde nicht gefunden: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "Schlüssel %s: Lesefehler im originalen Schlüsselblock: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "Schlüssel %s: \"%s\" 1 neue User-ID\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "Schlüssel %s: \"%s\" %d neue User-IDs\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "Schlüssel %s: \"%s\" 1 neue Signatur\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "Schlüssel %s: \"%s\" %d neue Signaturen\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "Schlüssel %s: \"%s\" 1 neuer Unterschlüssel\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "Schlüssel %s: \"%s\" %d neue Unterschlüssel\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d User-ID bereinigt\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d User-IDs bereinigt\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "Schlüssel %s: \"%s\" nicht geändert\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, c-format
msgid "key %s: secret key imported\n"
msgstr "Schlüssel %s: geheimer Schlüssel importiert\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "Schlüssel %s: geheimer Schlüssel bereits vorhanden\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "Schlüssel %s: Fehler beim Senden zum gpg-agent: %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, c-format
msgid "secret key %s: %s\n"
msgstr "Geheimer Schlüssel %s: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
msgid "importing secret keys not allowed\n"
msgstr "Importieren geheimer Schlüssel ist nicht erlaubt\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
@@@ -3530,146 -2728,119 +3504,146 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
"Um '%s' zu migrieren sollte für jede Smartcard \"%s\" aufgerufen werden.\n"
- #: g10/import.c:2133
++#: g10/import.c:2226
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"Schlüssel %s: Kein öffentlicher Schlüssel - der Schlüsselwiderruf kann nicht "
"angebracht werden\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - zurückgewiesen\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat importiert\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "Schlüssel %s: Keine User-ID für Signatur\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren für User-ID \"%s\"\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "Schlüssel %s: Ungültige Eigenbeglaubigung für User-ID \"%s\"\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "Schlüssel %s: Ungültige \"direct-key\"-Signatur\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselanbindung\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "Schlüssel %s: Ungültige Unterschlüssel-Anbindung\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "Schlüssel %s: Mehrfache Unterschlüssel-Anbindung entfernt\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "Schlüssel %s: Kein Unterschlüssel für Schlüsselwiderruf\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "Schlüssel %s: Ungültiger Unterschlüsselwiderruf\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "Schlüssel %s: Mehrfacher Unterschlüsselwiderruf entfernt\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "Schlüssel %s: User-ID übersprungen \"%s\"\n"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "Schlüssel %s: Unterschlüssel übersprungen\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr ""
"Schlüssel %s: Nicht exportfähige Signatur (Klasse %02x) - übersprungen\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "Schlüssel %s: Widerrufzertifikat an falschem Platz - übersprungen\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - übersprungen\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr ""
"Schlüssel %s: Unterschlüssel-Widerrufzertifikat an falschem Platz - "
"übersprungen\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "Schlüssel %s: unerwartete Signaturklasse (0x%02x) - übersprungen\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "Schlüssel %s: Doppelte User-ID entdeckt - zusammengeführt\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "WARNUNG: Schlüssel %s ist u.U. widerrufen: hole Widerrufschlüssel %s\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"WARNUNG: Schlüssel %s ist u.U. widerrufen: Widerrufschlüssel %s ist nicht "
"vorhanden\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat hinzugefügt\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "Schlüssel %s: \"direct-key\"-Signaturen hinzugefügt\n"
@@@ -4011,8 -3120,6 +3985,8 @@@ msgstr "Ich habe diesen Schlüssel seh
msgid "Really sign? (y/N) "
msgstr "Wirklich signieren? (j/N) "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@@ -4467,13 -3472,9 +4441,13 @@@ msgstr "
"Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
"Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
msgid "revoked"
msgstr "widerrufen"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "verfallen"
@@@ -5401,33 -4224,28 +5375,33 @@@ msgstr " Schl.-Fingerabdruck =
msgid " Card serial no. ="
msgstr " Kartenseriennr. ="
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, c-format
msgid "caching keyring '%s'\n"
msgstr "Puffern des Schlüsselbundes `%s'\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "%lu Schlüssel bislang gepuffert (%lu Beglaubigung)\n"
msgstr[1] "%lu Schlüssel bislang gepuffert (%lu Beglaubigungen)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] "%lu Schlüssel gepuffert"
msgstr[1] "%lu Schlüssel gepuffert"
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, c-format
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
msgstr[0] " (%lu Beglaubigung)\n"
msgstr[1] " (%lu Beglaubigungen)\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: Schlüsselbund erstellt\n"
@@@ -5644,116 -4417,96 +5618,121 @@@ msgstr "
msgid "no signature found\n"
msgstr "Keine Signatur gefunden\n"
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, c-format
msgid "BAD signature from \"%s\""
msgstr "FALSCHE Signatur von \"%s\""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Verfallene Signatur von \"%s\""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, c-format
msgid "Good signature from \"%s\""
msgstr "Korrekte Signatur von \"%s\""
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "Signaturüberprüfung unterdrückt\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
msgid "can't handle this ambiguous signature data\n"
msgstr "diese mehrdeutige Signaturdaten können nicht bearbeitet werden\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, c-format
msgid "Signature made %s\n"
msgstr "Signatur vom %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, c-format
msgid " using %s key %s\n"
msgstr " mittels %s-Schlüssel %s\n"
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Signatur vom %s mittels %s-Schlüssel ID %s\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, c-format
+ msgid " issuer \"%s\"\n"
+ msgstr " Aussteller \"%s\"\n"
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "Schlüssel erhältlich bei: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[ungewiß] "
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, c-format
msgid " aka \"%s\""
msgstr " alias \"%s\""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "Diese Signatur ist seit %s verfallen.\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "Diese Signatur verfällt am %s.\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s Signatur, Hashmethode %s%s%s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "Binäre"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "Textmodus"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "unbekannt"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
msgid ", key algorithm "
msgstr ", Schlüsselverfahren "
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
"WARNUNG: Keine abgetrennte Signatur; die Datei '%s' wurde NICHT überprüft!\n"
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Signatur kann nicht geprüft werden: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "keine abgetrennte Signatur\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"WARNUNG: Mehrfache Signaturen erkannt. Es wird nur die erste geprüft.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "Einzelne Signatur der Klasse 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "Signatur nach alter (PGP 2.x) Art\n"
@@@ -5936,94 -4654,50 +5915,61 @@@ msgstr "
msgid "subpacket of type %d has critical bit set\n"
msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, c-format
msgid "problem with the agent: %s\n"
msgstr "Problem mit dem Agenten: %s\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, c-format
- msgid " (main key ID %s)"
- msgstr " (Hauptschlüssel-ID %s)"
-
- #: g10/passphrase.c:277
- #, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
- "entsperren.\n"
- "Benutzer: \"%.*s\"\n"
- "%u-bit %s Schlüssel, ID %s, erzeugt %s%s\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Geben Sie die Passphrase ein\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "Abbruch durch Benutzer\n"
- #: g10/passphrase.c:483
- #, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu entsperren.\n"
- "Benutzer: \"%s\"\n"
-
- #: g10/passphrase.c:491
++#: g10/passphrase.c:489
#, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%u-Bit %s Schlüssel, ID %s, erzeugt %s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr " (Unterschlüssel aus Hauptschlüssel-ID %s)"
+ msgid " (main key ID %s)"
+ msgstr " (Hauptschlüssel-ID %s)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr ""
"Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
"entsperren:"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr ""
"Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
"importieren:"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr ""
"Sie benötigen eine Passphrase, um den geheimen OpenPGP Unterschlüssel zu "
"exportieren:"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr ""
"Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
"exportieren:"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr ""
"Möchten Sie den ausgewählten geheimen OpenPGP Unterschlüssel wirklich "
"dauerhaft entfernen? (j/N) "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr ""
"Möchten Sie den ausgewählten geheimen OpenPGP Schlüssel wirklich dauerhaft "
"entfernen? (j/N) "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, c-format
msgid ""
"%s\n"
@@@ -6227,131 -4866,104 +6173,131 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "Diesen Schlüssel trotzdem benutzen? (j/N) "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "WARNUNG: Ein Schlüssel ohne gesichertes Vertrauen wird benutzt!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr ""
"WARNUNG: Dieser Schlüssel ist u.U. widerrufen: Widerrufschlüssel ist nicht "
"vorhanden\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr ""
"WARNUNG: Dieser Schlüssel wurde vom vorgesehen Widerrufer widerrufen!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "WARNUNG: Dieser Schlüssel wurde von seinem Besitzer widerrufen!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
msgid " This could mean that the signature is forged.\n"
msgstr " Das könnte bedeuten, daß die Signatur gefälscht ist.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "WARNUNG: Dieser Unterschlüssel wurde von seinem Besitzer widerrufen!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Hinweis: Dieser Schlüssel wurde abgeschaltet.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Hinweis: Überprüfte Adresse des Unterzeichners ist `%s'\n"
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "Hinweis: Adresse des Unterzeichners `%s' passt nicht zum DNS-Eintrag\n"
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "\"Trust\"-Ebene auf VOLLSTÄNDIG geändert (wg. gültiger PKA-Info)\n"
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "\"Trust\"-Ebene auf NIEMALS geändert (wg. falscher PKA-Info)\n"
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Hinweis: Dieser Schlüssel ist verfallen!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "WARNUNG: Dieser Schlüssel trägt keine vertrauenswürdige Signatur!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Es gibt keinen Hinweis, daß die Signatur wirklich dem vorgeblichen "
"Besitzer gehört.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schlüssel!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " Die Signatur ist wahrscheinlich eine FÄLSCHUNG.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"WARNUNG: Dieser Schlüssel ist nicht durch hinreichend vertrauenswürdige "
"Signaturen zertifiziert!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr ""
" Es ist nicht sicher, daß die Signatur wirklich dem vorgeblichen "
"Besitzer gehört.\n"
- #: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: übersprungen: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, c-format
msgid "can't encrypt to '%s'\n"
msgstr "Verschlüsseln an '%s' ist nicht möglich\n"
- #: g10/pkclist.c:984
++#: g10/pkclist.c:988
#, 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:991
++#: g10/pkclist.c:995
#, 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:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr "Derzeitige Empfänger:\n"
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6359,38 -4971,30 +6305,38 @@@ msgstr "
"\n"
"Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Keine solche User-ID vorhanden.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
msgid "skipped: public key already set as default recipient\n"
msgstr ""
"übersprungen: öffentlicher Schlüssel bereits als Standardempfänger gesetzt\n"
- #: g10/pkclist.c:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "Öffentlicher Schlüssel ist abgeschaltet.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "übersprungen: öffentlicher Schlüssel bereits gesetzt\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "Unbekannter voreingestellter Empfänger \"%s\"\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "Keine gültigen Adressaten\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, 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:1649
++#: g10/pkclist.c:1653
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Hinweis: Schlüssel %s hat keine Einstellung für %s\n"
@@@ -6682,7 -5234,6 +6628,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "Öffentlicher Schlüssel %s ist %lu Tag jünger als die Signatur\n"
msgstr[1] "Öffentlicher Schlüssel %s ist %lu Tage jünger als die Signatur\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6762,12 -5304,10 +6708,12 @@@ msgstr "
"WARNUNG: URL für bevorzugten Schlüsselserver kann nicht %%-erweitert werden "
"(zu groß). Verwende \"unerweiterte\".\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s Signatur von: \"%s\"\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6775,11 -5315,9 +6721,11 @@@ msgstr "
"WARNUNG: Erzwingen des Hashverfahrens %s (%d) verstößt gegen die "
"Empfängervoreinstellungen\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "signiere:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s Verschlüsselung wird verwendet\n"
@@@ -6884,7 -5402,6 +6830,7 @@@ msgstr "trustdb Transaktion zu groß\n
msgid "%s: directory does not exist!\n"
msgstr "%s: Verzeichnis existiert nicht!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, c-format
msgid "can't access '%s': %s\n"
msgstr "kann auf `%s' nicht zugreifen: %s\n"
@@@ -6993,68 -5488,47 +6939,59 @@@ msgstr "Textzeilen länger als %d Zeich
msgid "input line longer than %d characters\n"
msgstr "Eingabezeile ist länger als %d Zeichen\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "Fehler beim Starten einer Transaktion auf der TOFU Datenbank: %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr "Fehler beim Committen einer Transaktion auf der TOFU Datenbank: %s\n"
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
"Fehler beim Zurückrollen einer Transaktion auf der TOFU Datenbank: %s\n"
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr "Nicht unterstützte TOFU Datenbank Version: %s\n"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "Fehler beim Lesen der TOFU Datenbank: %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, c-format
msgid "error determining TOFU database's version: %s\n"
msgstr "Fehler beim Feststellen der TOFU Datenbank Version: %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, c-format
msgid "error initializing TOFU database: %s\n"
msgstr "Fehler beim Initialisieren der TOFU Datenbank: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "Fehler beim Öffner der TOFU Datenbank '%s': %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
- "WARNUNG: Das Home-Verzeichnis hat sowohl 'tofu.db' als auch 'tofu.d'.\n"
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr "Das \"Split\" Format wird für die TOFU Datenbank benutzt\n"
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "Fehler beim Schreiben der TOFU Datenbank: %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr "Die Bindung %s ist NICHT bekannt."
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
@@@ -7064,7 -5538,6 +7001,7 @@@ msgstr "
"(%s). Die Richtlinie dieser Bindung wurde deswegen von 'auto' auf 'ask' "
"geändert."
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
@@@ -7074,70 -5547,58 +7011,70 @@@ msgstr "
"Schlüssel gehört dem angegebenen Besitzer) oder eine Fälschung (ungültig) "
"ist."
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "Fehler beim Einsammeln der übrigen User-IDs: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr "Bekannte, mit diesem Schlüssel assozierte, User-IDs:\n"
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, c-format
msgid "policy: %s"
msgstr "Richtlinie: %s"
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, c-format
msgid "error gathering signature stats: %s\n"
msgstr "Fehler beim Einsammeln der Signaturstatistik: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] "Die Email-Adresse \"%s\" ist mit einem Schlüssel assoziert:\n"
msgstr[1] "Die Email-Adresse \"%s\" ist mit %d Schlüsseln assoziert:\n"
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "Statistik für Schlüssel mit der Email-Adresse \"%s\":\n"
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
msgid "this key"
msgstr "dieser Schlüssel"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] "%ld Nachricht in der Zukunft signiert."
msgstr[1] "%ld Nachrichten in der Zukunf signiert."
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "%ld Nachricht signiert"
msgstr[1] "%ld Nachrichten signiert"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] " innerhalb des letzten Tages."
msgstr[1] " innerhalb der letzten %ld Tage."
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] " innerhalb der letzten Woche."
msgstr[1] " innerhalb der letzten %ld Wochen."
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7147,7 -5608,6 +7084,7 @@@ msgstr[1] " innerhalb der letzten %ld M
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
"Normalerweise ist lediglich ein Schlüssel mit einer Email-Adresse "
@@@ -7161,74 -5621,62 +7098,74 @@@
#. 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:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr "gGaAuUlLfF"
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr "(G)ut, einmal (A)kzeptieren, (U)nbekannt, einmal ab(L)ehnen, (F)alsch?"
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "Fehler beim Setzen der TOFU Binding Vertrauensstufe auf %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "Fehler beim Ändern der TOFU Richtlinie: %s\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] "%d~Jahr"
msgstr[1] "%d~Jahre"
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] "%d~Monat"
msgstr[1] "%d~Monate"
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] "%d~Tag"
msgstr[1] "%d~Tage"
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] "%d~Stunde"
msgstr[1] "%d~Stunden"
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] "%d~Minute"
msgstr[1] "%d~Minuten"
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] "%d~Sekunde"
msgstr[1] "%d~Sekunden"
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr "Es wurde noch keine Nachricht mit dem Schlüssel %s überprüft!\n"
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
@@@ -7237,12 -5685,10 +7174,12 @@@ msgstr "
"Signaturstatistiken für \"%s\" (Schlüssel %s) konnten nicht gesammelt "
"werden\n"
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, c-format
msgid "Verified %ld messages signed by \"%s\"."
msgstr "%ld überprüfte Nachrichten von \"%s\"."
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7257,24 -5703,20 +7194,24 @@@ msgstr[1] "
"%ld überprüfte Nachrichten von \"%s\"\n"
"in den letzten %s."
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr "Die neueste Nachricht wurde vor %s überprüft."
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
"WARNUNG: Wir müssen noch eine mit diesem Schlüssel signierte Nachricht "
"sehen.\n"
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
"WARNUNG: Wir haben nur eine einzige mit diesem Schlüssel signierte Nachricht "
"gesehen.\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7303,8 -5745,6 +7240,7 @@@ msgstr[1] "
" %s\n"
"um den Schlüssel als Fälschung zu markieren.\n"
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "Fehler beim Öffnen der TOFU Datenbank: %s\n"
@@@ -7844,7 -6175,6 +7780,7 @@@ msgstr "|N|Erstmalige neue PIN
msgid "run in multi server mode (foreground)"
msgstr "Im Multiserver Modus ausführen"
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NAME|Die Debugstufe auf NAME setzen"
@@@ -7896,18 -6215,15 +7832,18 @@@ msgstr "
"Syntax: @SCDAEMON@ [Optionen] [Befehl [Argumente]]\n"
"Smartcard Daemon für @GNUPG@\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
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:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr "Handhabungsroutine für fd %d gestartet\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "Handhabungsroutine für den fd %d beendet\n"
@@@ -8007,12 -6300,10 +7943,12 @@@ msgstr "
msgid "checking the CRL failed: %s"
msgstr "Die CRL konnte nicht geprüft werden: %s"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr "Zertifikat mit unzulässiger Gültigkeit: %s"
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr "Das Zertifikat ist noch nicht gültig"
@@@ -8024,7 -6313,6 +7960,7 @@@ msgstr "Das Wurzelzertifikat ist noch n
msgid "intermediate certificate not yet valid"
msgstr "Das Zwischenzertifikat ist noch nicht gültig"
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
msgid "certificate has expired"
msgstr "Das Zertifikat ist abgelaufen"
@@@ -8077,7 -6354,6 +8013,7 @@@ msgstr " ( Zertifikat gültig von
msgid " ( issuer valid from "
msgstr " ( Herausgeber gültig von "
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, c-format
msgid "fingerprint=%s\n"
msgstr "Fingerprint=%s\n"
@@@ -8110,7 -6380,6 +8046,7 @@@ msgstr "Im Zertifikat ist kein Herausge
msgid "self-signed certificate has a BAD signature"
msgstr "Das eigenbeglaubigte Zertifikat hat eine FALSCHE Signatur"
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert"
@@@ -8119,30 -6387,24 +8055,30 @@@
msgid "checking the trust list failed: %s\n"
msgstr "Fehler beim Prüfen der vertrauenswürdigen Zertifikate: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr "Der Zertifikatkette ist zu lang\n"
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr "Herausgeberzertifikat nicht gefunden"
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
msgid "certificate has a BAD signature"
msgstr "Das Zertifikat hat eine FALSCHE Signatur"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr ""
"Eine anderes möglicherweise passendes CA-Zertifikat gefunden - versuche "
"nochmal"
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr "Die Zertifikatkette ist länger als von der CA erlaubt (%d)"
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
msgid "certificate is good\n"
msgstr "Das Zertifikat ist korrekt\n"
@@@ -8173,7 -6429,6 +8109,7 @@@ msgstr "
msgid "(this is the MD2 algorithm)\n"
msgstr "(Dies ist der MD2 Algorithmus)\n"
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
msgid "none"
msgstr "keine"
@@@ -8209,39 -6459,31 +8145,39 @@@ msgstr "
"gültig von %s bis %s\n"
"zu entsperren.\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr ""
"Schlüsselverwendungszweck nicht vorhanden - für alle Zwecke akzeptiert\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "Fehler beim Holen der Schlüsselbenutzungsinformationen: %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr "Das Zertifikat hätte nicht zum Zertifizieren benutzt werden sollen\n"
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr ""
"Das Zertifikat hätte nicht zum Signieren von OCSP Antworten benutzt werden "
"sollen\n"
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr "Das Zertifikat hätte nicht zum Verschlüsseln benutzt werden sollen\n"
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr "Das Zertifikat hätte nicht zum Signieren benutzt werden sollen\n"
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr "Das Zertifikat kann nicht zum Verschlüsseln benutzt werden\n"
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr "Das Zertifikat kann nicht zum Signieren benutzt werden\n"
@@@ -8659,21 -6811,17 +8595,21 @@@ msgstr "%s:%u: Passwort ohne Benutzer\n
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: Zeile wird übersprungen\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
msgid "could not parse keyserver\n"
msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "Importiere allgemeine Zertifikate: %s\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "Signieren mit `%s' nicht möglich: %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr "Ungültiger Befehl (Es gibt keinen implizierten Befehl)\n"
@@@ -8734,7 -6870,6 +8670,7 @@@ msgstr "Problem bei Wiederfinden des Ze
msgid "error storing flags: %s\n"
msgstr "Fehler beim Speichern der Flags: %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr "Fehler - "
@@@ -8871,93 -6985,69 +8807,88 @@@ msgstr "
msgid "dropping %u certificates from the cache\n"
msgstr "%u Zertifikate werden aus dem Zertifikatzwischenspeicher entfernt\n"
- #: dirmngr/certcache.c:352
- #, c-format
- msgid "can't access directory '%s': %s\n"
- msgstr "Fehler beim Zugriff auf das Verzeichnis `%s': %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, c-format
msgid "can't parse certificate '%s': %s\n"
msgstr "Zertifikat `%s' kann nicht zerlegt werden: %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, c-format
msgid "certificate '%s' already cached\n"
msgstr "Zertifikat `%s' ist bereits im Zwischenspeicher\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "Vertrauenswürdiges Zertifikat `%s' wurde geladen\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, c-format
msgid "certificate '%s' loaded\n"
msgstr "Zertifikat `%s' wurde geladen\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr " SHA1 Fingerabdruck=%s\n"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr " Issuer ="
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr " Subjekt ="
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "Fehler beim Laden des Zertifikats `%s': %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, c-format
msgid "permanently loaded certificates: %u\n"
msgstr " dauerhaft geladene Zertifikate: %u\n"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, c-format
msgid " runtime cached certificates: %u\n"
msgstr "zur Laufzeit zwischengespeicherte Zertifikate: %u\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
msgid "certificate already cached\n"
msgstr "Zertifikat ist bereits im Zwischenspeicher\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
msgid "certificate cached\n"
msgstr "Zertifikat wurde zwischengespeichert\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, c-format
msgid "error caching certificate: %s\n"
msgstr "Fehler beim Zwischenspeichern des Zertifikats: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "ungültiger SHA1 Fingerabdruck `%s'\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "Fehler beim Holen des Zertifikats mittels Seriennummer: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "Fehler beim Holen des Zertifikats mittels Subject: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
msgid "no issuer found in certificate\n"
msgstr "Im Zertifikat ist kein Herausgeber enthalten\n"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "Fehler beim Holen des \"authorityKeyIdentifier\": %s\n"
@@@ -9231,7 -7270,6 +9162,7 @@@ msgstr "S/N %s ist gültig; sie ist nic
msgid "error getting data from cache file: %s\n"
msgstr "Fehler beim Holen der Daten aus der Zwischenspeicherdatei: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, c-format
msgid "unknown hash algorithm '%s'\n"
msgstr "Ungültige Hashmethode `%s'\n"
@@@ -9250,7 -7285,6 +9181,7 @@@ msgstr "Ungültige S-Expression von Lib
msgid "converting S-expression failed: %s\n"
msgstr "Konvertierung der S-Expression fehlgeschlagen: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, c-format
msgid "creating S-expression failed: %s\n"
msgstr "Erzeugen der S-Expression fehlgeschlagen: %s\n"
@@@ -9640,112 -7594,81 +9571,108 @@@ msgstr "Absoluter Dateiname erwartet\n
msgid "looking up '%s'\n"
msgstr "Auffinden von `%s'\n"
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr "Als Windows-Service ausführen (Hintergrund)"
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr "Den Inhalt des CRL Zwischenspeichers anzeigen"
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
msgid "|FILE|load CRL from FILE into cache"
msgstr "|DATEI|Lade die CRL aus der DATEI in den Zwischenspeicher"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|Hole eine CRL von dieser URL"
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr "Den Dirmngr herunterfahren"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr "Den Zwischenspeicher löschen"
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
msgid "run without asking a user"
msgstr "Ausführung ohne Benutzernachfrage"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr "Laden von abgelaufenen CRLs erzwingen"
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr "OCSP Anfragen erlauben"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr "Sperre die Benutzung von HTTP"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr "Sperre die Benutzung von LDAP"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr "Übergehe HTTP CRL Distribution Points"
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr "Übergehe LDAP CRL Distribution Points"
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr "Übergehe im Zertifikat enthaltene OCSP Service URLs"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|Leite alle HTTP Anfragen über URL"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HOST|Benutze HOST für LDAP Anfragen"
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "Keine Benutzung der Rückgriffshosts mit --ldap-proxy"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
msgid "|FILE|read LDAP server list from FILE"
msgstr "|DATEI|Lese die LDAP Serverliste aus DATEI"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
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:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 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:209
++#: dirmngr/dirmngr.c:196
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|Benutze den OCSP Responder mit dieser URL"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|OCSP Antwort ist durch FPR signiert"
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
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:222
++#: dirmngr/dirmngr.c:209
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:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr "Netzzugriff nur über Tor"
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9755,11 -7678,9 +9682,11 @@@ msgstr "
"(Im \"info\"-Handbuch findet sich eine vollständige Liste aller Kommandos "
"und Optionen)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Gebrauch: @DIRMNGR@ [Optionen]"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9767,79 -7688,62 +9694,79 @@@ msgstr "
"Syntax: @DIRMNGR@ [Optionen] [Kommando [Argumente]]\n"
"Keyserver, CRL und OCSP Zugriff für @GNUPG@\n"
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "Gültige Debugebenen sind: %s\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, c-format
msgid "usage: %s [options] "
msgstr "Aufruf: %s [Optionen] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
msgid "colons are not allowed in the socket name\n"
msgstr "Doppelpunkte sind im Namen des Sockets nicht erlaubt\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: Zeile ist zu lang - übergangen\n"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: ungültiger Fingerabdruck erkannt\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: Lesefehler: %s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, 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:1807
++#: dirmngr/dirmngr.c:1631
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:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr "SIGUSR2 empfangen - keine Aktion definiert\n"
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr "SIGTERM empfangen - wird heruntergefahren ...\n"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "SIGTERM empfangen - immer noch %d Verbindungen aktiv\n"
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
msgid "shutdown forced\n"
msgstr "Herunterfahren wurde erzwungen\n"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr "SIGINT empfangen - wird sofort heruntergefahren\n"
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "Signal %d empfangen - keine Aktion definiert\n"
@@@ -10169,99 -8003,78 +10096,99 @@@ msgstr "Hashen der OCSP Antwort für `%
msgid "not signed by a default OCSP signer's certificate"
msgstr "Nicht durch voreingestelltes OCSP \"Signer-Zertifikat\" signiert"
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr "Lediglich SHA-1 wird bei OCSP Antworten unterstützt\n"
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, c-format
msgid "allocating list item failed: %s\n"
msgstr "malloc() fehlgeschlagen: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, c-format
msgid "error getting responder ID: %s\n"
msgstr "Fehler beim Holen der Responder-ID: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr ""
"Kein benutzbares Zertifikat zur Überprüfung der OCSP Antwort gefunden\n"
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, c-format
msgid "issuer certificate not found: %s\n"
msgstr "Herausgeberzertifikat nicht gefunden: %s\n"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr "Aufrufer gab das Ziel Zertifikat nicht zurück\n"
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
msgid "caller did not return the issuing certificate\n"
msgstr "Aufrufer gab das Issuer Zertifikat nicht zurück\n"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "Fehler beim Bereitstellen eines OCSP Kontext: %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, c-format
msgid "can't get authorityInfoAccess: %s\n"
msgstr "authorityInfoAccess kann nicht geholt werden: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr "Kein voreingestellter OCSP Responder definiert\n"
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
msgid "no default OCSP signer defined\n"
msgstr "Kein voreingestellter OCSP \"Signer\" definiert\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr "Der voreingestellte OCSP Responder `%s' wird benutzt\n"
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, c-format
msgid "using OCSP responder '%s'\n"
msgstr "Der OCSP Responder `%s' wird benutzt\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr "Kontext zum Hashen von OCSP kann nicht erzeugt werden: %s\n"
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "Fehler beim Holen des OCSP Status für das Zielzertifikat: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr "Zertifikatstatus ist: %s (this=%s next=%s)\n"
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr "Gut"
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "Zertifikat wurde widerrufen am: %s wegen: %s\n"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr "OCSP Responder gab einen Status in der Zukunft zurück\n"
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr "OCSP Responder gab einen nicht aktuellen Status zurück\n"
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr "OCSP Responder gab einen zu alten Status zurück\n"
@@@ -10309,32 -8112,26 +10236,32 @@@ msgstr "fetch_next_cert fehlgeschlagen
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d überschritten\n"
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "Fehler beim Erzeugen der Kontrollstruktur: %s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "Fehler beim Bereitstellen eines Assuan Kontext: %s\n"
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "Fehler beim Initialisieren des Servers: %s\n"
- #: dirmngr/server.c:2444
++#: dirmngr/server.c:2406
#, 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:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan accept Problem: %s\n"
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuan Verarbeitung fehlgeschlagen: %s\n"
@@@ -10356,34 -8149,24 +10283,30 @@@ msgstr "keine Prüfung der CRL für
msgid "checking CRL for"
msgstr "Prüfen der CRL für"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr "Kompatibilitätsmodus - Zertifikatkette nicht geprüft!\n"
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
msgid "selfsigned certificate has a BAD signature"
msgstr "Das eigenbeglaubigte Zertifikat hat eine FALSCHE Signatur"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr ""
"Prüfung der Vertrauenswürdigkeit des Wurzelzertifikats fehlgeschlagen: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
msgid "certificate chain is good\n"
msgstr "Der Zertifikatkette ist gültig\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA benötigt eine 160 Bit Hashmethode\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
"Das Zertifikat hätte nicht zum Signieren einer CRL benutzt werden sollen\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
msgid "quiet"
msgstr "Reduzierte Informationen"
@@@ -10509,11 -8261,9 +10432,11 @@@ msgstr "|N|setze die maximale Lebenszei
msgid "Options enforcing a passphrase policy"
msgstr "Optionen für eine Passphrase-Policy"
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr "Einhaltung der Passphrase-Policy erzwingen"
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|setze die kleinste erlaubte Länge von Passphrasen auf N"
@@@ -10648,67 -8366,51 +10571,67 @@@ msgstr "Die externe Überprüfung der K
msgid "Note that group specifications are ignored\n"
msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr "Liste aller Komponenten"
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr "Prüfe alle Programme"
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr "|KOMPONENTE|Zeige die Optionen an"
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr "|KOMPONENTE|Ändere die Optionen"
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr "|KOMPONENTE|Prüfe die Optionen"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr "Wende die gobalen Voreinstellungen an"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr "Hole die Einstellungsverzeichnisse von @GPGCONF@"
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
msgid "list global configuration file"
msgstr "Zeige die globale Konfigurationsdatei an"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
msgid "check global configuration file"
msgstr "Prüfe die globale Konfigurationsdatei"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr "\"reload\" an alle oder eine Komponente senden"
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr "Die angegebene Komponente starten"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr "\"kill\" an eine Komponente senden"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "Als Ausgabedatei benutzen"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr "Aktiviere Änderungen zur Laufzeit; falls möglich"
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Gebrauch: @GPGCONF@ [Optionen] (-h für Hilfe)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10716,15 -8418,12 +10639,15 @@@ msgstr "
"Syntax: @GPGCONF@ {Optionen]\n"
"Verwalte Konfigurationsoptionen für Programme des @GNUPG@ Systems\n"
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr "Benötige ein Komponentenargument"
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
msgid "Component not found"
msgstr "Komponente nicht gefunden"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
msgid "No argument allowed"
msgstr "Argumente sind nicht erlaubt"
@@@ -10776,122 -8466,97 +10699,122 @@@ msgstr "
"SCHLUESSELDATEI [Optionen...] KOMMANDO [Eingabedatei]\n"
"Aufruf eines einfachen symmetrischen Verschlüsselungstool\n"
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s auf %s brach mit Status %i ab\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, c-format
msgid "%s on %s failed with status %i\n"
msgstr "%s auf %s schlug mit Status %i fehl\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "Das temporäre Verzeichnis `%s' kann nicht erstellt werden: %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr "%s kann nicht zum Schreiben geöffnet werden: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, c-format
msgid "error writing to %s: %s\n"
msgstr "Fehler beim Schreiben von %s: %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, c-format
msgid "error reading from %s: %s\n"
msgstr "Fehler beim Lesen von %s: %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, c-format
msgid "error closing %s: %s\n"
msgstr "Fehler beim Schließen von %s: %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
msgid "no --program option provided\n"
msgstr "Option --program nicht angegeben\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr "nur --decrypt und --encrypt sind vorhanden\n"
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr "keine --keyfile -Option angegeben\n"
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr "Kann \"args-vector\" nicht zuteilen\n"
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, c-format
msgid "could not create pipe: %s\n"
msgstr "Pipe kann nicht erzeugt werden: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, c-format
msgid "could not create pty: %s\n"
msgstr "Pty kann nicht erzeugt werden: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr "Kann nicht fork()en: %s\n"
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, c-format
msgid "execv failed: %s\n"
msgstr "Der execv()-Aufruf ist fehlgeschlagen: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, c-format
msgid "select failed: %s\n"
msgstr "Der select()-Aufruf ist fehlgeschlagen: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, c-format
msgid "read failed: %s\n"
msgstr "Lesen schlug fehl: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, c-format
msgid "pty read failed: %s\n"
msgstr "\"pty read\"-Aufruf ist fehlgeschlagen: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, c-format
msgid "waitpid failed: %s\n"
msgstr "Der waitpid()-Aufruf ist fehlgeschlagen: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr "Kind brach mit Status %i ab\n"
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "Kann In-Datei-Zeichenkette keinen Speicher zuteilen: %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "Kann Out-Datei-Zeichenkette keinen Speicher zuteilen: %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr "entweder %s oder %s muß angegeben sein\n"
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr "keine Klasse angegeben\n"
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, c-format
msgid "class %s is not supported\n"
msgstr "Klasse %s wird nicht unterstützt\n"
diff --cc po/el.po
index ada9887,6930a87..7c487f3
--- a/po/el.po
+++ b/po/el.po
@@@ -8,7 -8,6 +8,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg-1.1.92\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2003-06-27 12:00+0200\n"
"Last-Translator: Dokianakis Theofanis <madf at hellug.gr>\n"
"Language-Team: Greek <nls at tux.hellug.gr>\n"
@@@ -100,14 -84,10 +100,14 @@@ msgstr "�������������� �� ����� ������
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
#, fuzzy
msgid "Passphrase:"
msgstr "���� ����� ������"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr ""
@@@ -152,98 -124,70 +152,98 @@@ msgstr "���� MPI
msgid "Bad Passphrase"
msgstr "���� ����� ������"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "��� ������������� � ���������� ���������� %d%s\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, 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:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
msgstr "�������� ��������� ��� `%s': %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, fuzzy, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "�������� �������� �������� ����������� `%s': %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "�� ������� ��������� ������� ����������: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, fuzzy, c-format
msgid "shadowing the key failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, fuzzy, c-format
msgid "error writing key: %s\n"
msgstr "�������� �������� ��� ����������� `%s': %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "������ ��� ������ ������"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
"%s%%0Awithin gpg-agent's key storage"
msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: �������� ����������� hashtable: %s\n"
@@@ -384,8 -302,6 +384,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "������ ��� ������ ������"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -395,118 -311,87 +395,118 @@@ msgstr "
"��������:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "���������"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "����� ������"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|������|������� ��� ���������� ��������� ������"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "��������� �������� �� ��� ���������� ��������"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "�������� ��� ����� ��������� ������������"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|�����|���������� ��� ��� ���������� ���������� �� �����"
- #: agent/gpg-agent.c:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
#, fuzzy
msgid "allow presetting passphrase"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "��� �������������"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -515,134 -400,92 +515,126 @@@ 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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "��������� �� ���������� ��� <gnupg-bugs at gnu.org>\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "�����: gpg [��������] [������] (-h ��� �������)"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr ""
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "������ �������� `%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "�������� �������� ��� `%s'\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "�������� ����������� ��� %s: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, 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:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: ��������� �������������\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: read ������� (n=%d): %s\n"
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: �������� ����������� ���������: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@@ -657,28 -498,22 +649,28 @@@ msgstr "
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2390
++#: agent/gpg-agent.c:2392
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "� ��������� �������� �������: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ������������: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
@@@ -694,8 -527,6 +686,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -703,9 -534,6 +695,9 @@@ msgstr "
"@�������:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -726,40 -552,33 +718,40 @@@ msgid "
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
#, fuzzy
msgid "cancelled\n"
msgstr "�������"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@@ -929,42 -719,30 +921,42 @@@ msgstr "��� ������������� � ����������
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "��� ������������� � ���������� ���������� %d%s\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@@ -979,37 -755,15 +971,18 @@@ msgstr "�������� �������� �������� ����
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "�������� �������� ��� `%s': %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "�������� ������������ �� �� gpg-agent\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
#, fuzzy
msgid "problem setting the gpg-agent options\n"
msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- #, fuzzy
- msgid "canceled by user\n"
- msgstr "��������� ��� �� ������\n"
-
- #: common/simple-pwquery.c:579
- #, fuzzy
- msgid "problem with the agent\n"
- msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "�������� ��������������� ��� core dump: %s\n"
@@@ -1095,7 -832,6 +1068,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1119,17 -851,14 +1092,17 @@@ msgstr "
msgid "connection to agent is in restricted mode\n"
msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr ""
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1423,7 -1092,6 +1396,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
#, fuzzy
msgid "out of core\n"
msgstr "�� �������������"
@@@ -1482,7 -1139,10 +1455,13 @@@ msgstr "�� ������� ������ %08lX ��� ���
msgid "waiting for lock %s...\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr ""
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "��������: %s\n"
@@@ -1733,10 -1338,6 +1712,10 @@@ msgstr "������ ��������� ������� ������
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
@@@ -2035,27 -1571,18 +2014,27 @@@ msgstr "������� ��� �������� �������� �
msgid "Invalid command (try \"help\")\n"
msgstr "�� ������ ������ (��������� \"help\")\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output ��� ���������� ��� ���� ��� ������\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "�������� ��������� ��� `%s'\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "�� ������ '%s' �� �������: %s\n"
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
@@@ -2118,39 -1633,32 +2097,39 @@@ msgid "use option \"--delete-secret-key
msgstr ""
"��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "�������� ������ ���� ����������� ������� ESK ���� ��� ���������� S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "����� ��� ���������������: %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' ��� �����������\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "�������������: `%s' ����� ��� ����� ������\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "�������� ��� `%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2158,7 -1666,6 +2137,7 @@@ msgstr "
"� ������������ ����������� ���������� %s (%d) ���������� ���\n"
"�������� ��� ���������\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2167,19 -1674,16 +2146,19 @@@ msgstr "
"� ������������ ������ ��� ���������� ��������� %s (%d) ���������� ���\n"
"�������� ��� ���������\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"� ������������ ����������� ���������� %s (%d) ���������� ���\n"
"�������� ��� ���������\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s ��������������� ���: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
@@@ -2294,8 -1777,6 +2273,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: ������������: %s\n"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2333,8 -1807,6 +2312,8 @@@ msgstr "������ ���� �� ���������� ��� `
msgid "[User ID not found]"
msgstr "[User id ��� �������]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "�� ������� �������� ���������\n"
@@@ -2404,218 -1863,169 +2383,218 @@@ msgstr "
msgid "using subkey %s instead of primary key %s\n"
msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "���������� ���� �� ������������� ���������"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
#, fuzzy
msgid "make a clear text signature"
msgstr "|[������]|���������� ���� �� ���������������� ���������"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "���������� ���� �� ������������� ���������"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "������������� ���������"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "������������� �� ����� ���� ����������� ����������"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "���������������� ��������� (��������������)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "���������� ���� ���������"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "���������� ��� ������ ��������"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "���������� ��� ������ �������� ��� ���������"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "list and check key signatures"
msgstr "������� ��������� ��������"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "���������� ��� ������ �������� ��������"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "���������� ���� ���� ������� ��������"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "���������� ���� ���� ������� ��������"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "���������� ���� ���� ������� ��������"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "���������� ���� ���� ������� ��������"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "���������� ���� �������������� ���������"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "�������� ��� �������� ��� �� ������� ����������"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "�������� ��� �������� ��� �� ������� ����������"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "�������� ���� ��������"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "�������� ���� �������� ������"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "�������� ���� ��������"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "�������� ���� �������� ������"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "�������� � ����������� ���� ��������"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "������ ��� ������ ������"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "������� ��������"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "������� �������� �� ��� ���������� ��������"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "�������� �������� ��� ��� ���������� ��������"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "��������� �������� �� ��� ���������� ��������"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "��������/���������� ��������"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "�������� ��� ����� ��������� ������������"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
#, fuzzy
msgid "print message digests"
msgstr "|����� [������]| ���������� ���������� ��� ���������"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "���������� ascii ������������ ������"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|�����|������������� ��� �����"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|���������� �������� ��������� N (0 �������������)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "����� ��������� ���������� ��������"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|������|������� ��� ���������� ��������� ������"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "�� �� ����� ������ ������"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "������� ���� ��� ���������"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2623,7 -2033,6 +2602,7 @@@ msgstr "
"@\n"
"(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2643,13 -2052,11 +2622,13 @@@ msgstr "
" --list-keys [�������] ���������� ��������\n"
" --fingerprint [�������] ���������� ������������ (fingerprints)\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "�����: gpg [��������] [������] (-h ��� �������)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2664,7 -2071,6 +2643,7 @@@ msgstr "
"��������, �������, ������������� � ����������������\n"
"� �������������� ���������� ��������� ��� �� �������� �������\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2672,613 -2078,479 +2651,608 @@@ msgstr "
"\n"
"��������������� ����������:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "�����������:"
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "���������������: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "��������: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "�����: gpg [��������] "
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "������������� �������\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "������� ����������� ��������� \"%s\"\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
#, fuzzy
msgid "show key usage information during key listings"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
#, fuzzy
msgid "show all notations during signature listings"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "������������� ��� ������"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "�������� ��������������� ���������� `%s'\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "�������� ��������������� ���������� `%s'\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, fuzzy, c-format
#| msgid "NOTE: old default options file `%s' ignored\n"
msgid "Note: old default options file '%s' ignored\n"
msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr ""
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "�� ������ ��������� Email\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "�� ������� ���������� hash `%s'\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: �� ������� �������� ���������\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "�� ������� �������� ���������\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "�� ������� �������� ���������\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: �� ������� �������� ���������\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
#, fuzzy
msgid "invalid list options\n"
msgstr "�� ������� �������� ���������\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
#, fuzzy
msgid "show all notations during signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
#, fuzzy
msgid "invalid verify options\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "�������� ������� ��� exec-path �� %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "�������������: �� %s ����������� �� %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�� %s ��� ����������� �� �� %s!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
"� ����������� ���������� ��������� ��� �����������\n"
"��� ����� �������\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "�� ������� �����������\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "�� ������� ����������� ���������� ���������������\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "�� ������� ����������� ���������� ���������� ���������\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "�� ������� ����������� ���������� ���������� ���������\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, fuzzy, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, fuzzy, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr ""
"����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, fuzzy, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr ""
"����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "�������� ������������� ��� TrustDB: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"�������������: ������� ���������� (-r) ����� ����� ��������������\n"
"�������� ��������\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [����� �������]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [����� �������]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "���������������� �������: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [����� �������]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [����� �������]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [����� �������]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [����� �������]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [����� �������]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [�������]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "keyserver �������� �������: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "keyserver ���� �������: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "������� �������� �������: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "������� �������� �������: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "keyserver ��������� �������: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "keyserver �������� �������: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "����������� �������: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "�������� �������: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "�� ������� ���������� hash `%s'\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[����� �������]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@@ -3323,328 -2587,262 +3297,328 @@@ msgstr "��� ������� ��������� �������
msgid "No help available for '%s'"
msgstr "��� ������� ��������� ������� ��� `%s'"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "�������� ��� ����� ��������� ������������"
- #: g10/import.c:143
++#: g10/import.c:147
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "�������� ��� ����� ��������� ������������"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
msgid "show key during import"
msgstr "���������� ��� fingerprint"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:152
++#: g10/import.c:156
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "�� ��������������� ������� ������"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "��������� �������� ��� ����� %d\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu ������� ����� ����� ���� ������������\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "��������� ������� ��� ��������������: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " ��� ������� ��� �������������: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ��� ������� ��� �������������: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ����� user ID: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " ����������: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " ����������: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " ��� user ID: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " ��� ����������: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " ���� ���������: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " ���� ���������� ��������: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " ����������� ������� �������: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " ���������� ������� �������: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " ���������� ������� �������: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " �� ����������: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " ���� ���������: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " ����������� ������� �������: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1042
++#: g10/import.c:1048
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s ��������, ���������� ��������� %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "������������ `%s': %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1264
++#: g10/import.c:1343
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "������ %08lX: ��� ���� ������ user ID\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "������ %08lX: ��� ������ - ������������\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "��� ������� ��������� ����������: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "�������� �������� ��� ����������� `%s': %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "������ %08lX: \"%s\" ����������\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "������ %08lX: ������� ������ ���������\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "������������: ������� ������ ��� �����\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "�� ������� ������ `%s' �� �������: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
@@@ -3659,147 -2857,120 +3633,147 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
"���������\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"������ %08lX: �� ��������������� ���������� �������� �������� ��� user id "
"\"%s\"\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "������ %08lX: ����� �������� �������� ����������\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "������ %08lX: �� ������ �������� �����������\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "������ %08lX: �� ������ �������� �����������\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "������ %08lX: ������������ user ID '"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "������ %08lX: ������������ ���������\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr ""
"������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr ""
"������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� "
"%08lX\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
"��� ����� �����.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "������ %08lX: ����� �������� �������� ����������\n"
@@@ -4160,8 -3269,6 +4134,8 @@@ msgstr "
msgid "Really sign? (y/N) "
msgstr "������� �� ���������; "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "� �������� �������: %s\n"
@@@ -4649,14 -3654,10 +4623,14 @@@ msgstr "
"� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
"����� ��� ��� �������������� �� ���������.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
#, fuzzy
msgid "revoked"
msgstr "[����������]"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5627,26 -4450,22 +5601,26 @@@ msgstr " ��������� �������� =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "������� ����������� `%s'\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "%lu ������� ����� �������� (%lu ���������)\n"
msgstr[1] "%lu ������� ����� �������� (%lu ���������)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5654,7 -4473,6 +5628,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 ���� ��������\n"
msgstr[1] "1 ���� ��������\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: ���������� �������������\n"
@@@ -5876,118 -4649,98 +5850,123 @@@ msgstr "���������� �������� - ���������
msgid "no signature found\n"
msgstr "���� �������� ��� \""
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "���� �������� ��� \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "������� �������� ��� \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "���� �������� ��� \""
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "��������� ��������� ���������\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "�������� ��������� ����� ��� ��������� ���������\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "�������� ����� ���� %s.\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " ������ ��� \""
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "�������� ����� ��� %.*s �� ����� ��� ��������%s ID %08lX\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ msgid " issuer \"%s\"\n"
+ msgstr " ������ ��� \""
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "������ ��������� ���: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[�������]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " ������ ��� \""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "�������� ����� ���� %s.\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "�������� ����� ���� %s.\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s ��������, ���������� ��������� %s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "�������"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "���������-��������"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "�������"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "�������� ���������� �������� ��������"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "�������� ������� ��� ���������: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "��� ����� ���������� ��������\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "���������� �������� ������ 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "�������� ������ ���� (PGP 2.x)\n"
@@@ -6172,89 -4890,44 +6151,55 @@@ msgstr "�������������: ������� �� �����
msgid "subpacket of type %d has critical bit set\n"
msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, fuzzy, c-format
- msgid " (main key ID %s)"
- msgstr " (����� ������, ID %08lX)"
-
- #: g10/passphrase.c:277
- #, fuzzy, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "���������� ��� ����� ������ ��� �� ������������ �� ������� ������ ��� �� "
- "������:\n"
- "\"%.*s\"\n"
- "%u-bit %s ������, ID %08lX, ���������� %s%s\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "�������������� �� ����� ������\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "��������� ��� �� ������\n"
- #: g10/passphrase.c:483
- #, fuzzy, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "\n"
- "���������� ��� ����� ������ ��� �� ������������ �� ������� ������\n"
- "��� �� ������: \""
-
- #: g10/passphrase.c:491
++#: g10/passphrase.c:489
#, fuzzy, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr ""
+ msgid " (main key ID %s)"
+ msgstr " (����� ������, ID %08lX)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "������� ������ �� ���������� �� ���������� �������; "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "������� ������ �� ���������� �� ���������� �������; "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6458,131 -5096,104 +6403,131 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "����� ���������� ����� ��� ��������; "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "�������������: ����� �������� ����� �����������!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr ""
"�������������: ���� �� ������ ������ �� ��������� (������ �� ������ "
"���������)\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr ""
"�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "�������������: ���� �� ������ ���� ��������� ��� ��� ��������� ���!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " ���� ������ �� �������� ��� � �������� ����� ������������.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr ""
"�������������: ���� �� ��������� ���� ��������� ��� ��� ��������� ���!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "��������: ���� �� ������ ���� ���������������.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "��������: ���� �� ������ ���� �����!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
"�������������: ���� �� ������ ��� ���� ������������ �� ������������ "
"��������!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " ��� ������� ������� ��� � �������� ������ ���� ���������.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "�������������: ��� �������������� ���� �� ������!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " � �������� ������ ����� ������������.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"�������������: ���� �� ������ ��� ���� ������������ �� ���������\n"
"������� ������������!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " ��� ����� ������ ��� � �������� ������ ���� ���������.\n"
- #: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ������������: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ������������: �� ������� ������ ���� ���������������.\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ������������: ������� ������ ����� ��� �����\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "�� ������� ���������� hash `%s'\n"
- #: g10/pkclist.c:991
++#: g10/pkclist.c:995
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "�� ������� ���������� hash `%s'\n"
- #: g10/pkclist.c:1094
++#: g10/pkclist.c:1098
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "��� �������� ��� user ID. (��������������� �� \"-r\")\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6590,38 -5201,30 +6535,38 @@@ msgstr "
"\n"
"�������������� �� user ID. ����� �� ��� ����� ������: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "��� ������� ���� �� user ID.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
msgid "skipped: public key already set as default recipient\n"
msgstr ""
"������������: ������� ������ ���� ��� ������� ��� �� ������� ����������\n"
- #: g10/pkclist.c:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "�� ������� ������ ���� ���������������.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "������������: ������� ������ ���� ��� �������\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "�������� ��������������� ���������� `%s'\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "������ ������ ���������\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
@@@ -6909,7 -5460,6 +6854,7 @@@ msgstr[0] "
msgstr[1] ""
"�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6983,12 -5524,10 +6928,12 @@@ msgstr "
"�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
" ����� �� ������������.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s �������� ���: \"%s\"\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6996,11 -5535,9 +6941,11 @@@ msgstr "
"� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
"����������� ��� ���������\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "��������:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s ������������� �� ��������������\n"
@@@ -7109,7 -5626,6 +7054,7 @@@ msgstr "���� ������ ��������� trustdb\n
msgid "%s: directory does not exist!\n"
msgstr "%s: � ������� ��� �������!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
@@@ -7221,150 -5715,117 +7166,142 @@@ msgstr "�������� ��������� ������� ����
msgid "input line longer than %d characters\n"
msgstr "������ ������� ���������� ��� %d ����������\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"��������������� ����������:\n"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "�������� �������� �������� ����������� `%s': %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: ������ ���� ������� ��� �������� dir : %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "��������: "
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "���������� ��� ������ ��������"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|����� [������]| ���������� ���������� ��� ���������"
msgstr[1] "|����� [������]| ���������� ���������� ��� ���������"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7374,93 -5835,78 +7311,93 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
msgid "Verified %ld messages signed by \"%s\"."
msgstr "|����� [������]| ���������� ���������� ��� ���������"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7471,20 -5917,16 +7408,20 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7501,8 -5943,6 +7438,7 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
@@@ -8044,7 -6375,6 +7980,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8100,16 -6419,13 +8036,16 @@@ msgid "
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8214,12 -6507,10 +8150,12 @@@ msgstr "
msgid "checking the CRL failed: %s"
msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr ""
@@@ -8232,7 -6521,6 +8168,7 @@@ msgstr "������� ��� �������� �������� �
msgid "intermediate certificate not yet valid"
msgstr ""
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
#, fuzzy
msgid "certificate has expired"
msgstr "���� �� ������ ���� �����!"
@@@ -8288,7 -6565,6 +8224,7 @@@ msgstr "���� �������������
msgid " ( issuer valid from "
msgstr ""
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "���������� ��� fingerprint"
@@@ -8318,7 -6588,6 +8254,7 @@@ msgstr "���������� ���� ��������������
msgid "self-signed certificate has a BAD signature"
msgstr ""
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr ""
@@@ -8327,29 -6595,23 +8263,29 @@@
msgid "checking the trust list failed: %s\n"
msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr ""
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr ""
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "���������� ���� ���������"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr ""
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
#, fuzzy
msgid "certificate is good\n"
msgstr "� ���������� %c%lu ������������\n"
@@@ -8382,7 -6638,6 +8318,7 @@@ msgstr "
msgid "(this is the MD2 algorithm)\n"
msgstr ""
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
#, fuzzy
msgid "none"
msgstr "���|���"
@@@ -8419,36 -6669,28 +8355,36 @@@ msgstr "
"\"%.*s\"\n"
"%u-bit %s ������, ID %08lX, ���������� %s%s\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "�������� �������� �������� ����������� `%s': %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr ""
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr ""
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr ""
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr ""
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr ""
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr ""
@@@ -8888,22 -7040,18 +8824,22 @@@ msgstr "
msgid "%s:%u: skipping this line\n"
msgstr " s = ��������� ����� ��� ��������\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "������� ��� `%s'\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8966,7 -7102,6 +8902,7 @@@ msgstr "rev? �������� ���� ������ �����
msgid "error storing flags: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr ""
@@@ -9085,98 -7199,73 +9021,92 @@@ msgstr "
msgid "dropping %u certificates from the cache\n"
msgstr ""
- #: dirmngr/certcache.c:352
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
- msgid "can't access directory '%s': %s\n"
- msgstr "�������� ����������� ��������� `%s': %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't parse certificate '%s': %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, fuzzy, c-format
msgid "certificate '%s' already cached\n"
msgstr "� ���������� %c%lu ������������\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, fuzzy, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "������������� ��������� �������������.\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, fuzzy, c-format
msgid "certificate '%s' loaded\n"
msgstr "� ���������� %c%lu ������������\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, fuzzy, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr "���������� ��� fingerprint"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, fuzzy, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, fuzzy, c-format
msgid "permanently loaded certificates: %u\n"
msgstr "���� �������������"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, fuzzy, c-format
msgid " runtime cached certificates: %u\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
#, fuzzy
msgid "certificate already cached\n"
msgstr "������������� ��������� �������������.\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
#, fuzzy
msgid "certificate cached\n"
msgstr "� ���������� %c%lu ������������\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, fuzzy, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "������: �� ������ ���������\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, fuzzy, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, fuzzy, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
#, fuzzy
msgid "no issuer found in certificate\n"
msgstr "���������� ���� �������������� ���������"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, fuzzy, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@@ -9439,7 -7477,6 +9369,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
@@@ -9461,7 -7495,6 +9391,7 @@@ msgstr "�� ������ �������� ��� ��� agen
msgid "converting S-expression failed: %s\n"
msgstr "�������� ��������� ��� �������: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
@@@ -9859,116 -7812,85 +9789,112 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr ""
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|������|������� ��� ���������� ��������� ������"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
#, fuzzy
msgid "run without asking a user"
msgstr "����������� ����� ����������; "
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|������|������� ��� ���������� ��������� ������"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9981,91 -7903,72 +9907,91 @@@ msgstr "
"@\n"
"(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "�����: gpg [��������] [������] (-h ��� �������)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "�����: gpg [��������] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
#, 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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "�������� �������: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "�������� �������: %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "� ������ ����� ���� ������\n"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "������: �� ������ ���������\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "������ ���������: %s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
#, fuzzy
msgid "shutdown forced\n"
msgstr "�� �������������"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10409,103 -8242,82 +10335,103 @@@ msgstr "������� � ������� ��� ��������
msgid "not signed by a default OCSP signer's certificate"
msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, fuzzy, c-format
msgid "allocating list item failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, fuzzy, c-format
msgid "error getting responder ID: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr ""
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, fuzzy, c-format
msgid "issuer certificate not found: %s\n"
msgstr "�� ������ '%s' �� �������: %s\n"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr ""
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
#, fuzzy
msgid "caller did not return the issuing certificate\n"
msgstr "���������� ���� �������������� ���������"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, fuzzy, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "�������� ������������� ��� TrustDB: %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, fuzzy, c-format
#| msgid "%s: can't access: %s\n"
msgid "can't get authorityInfoAccess: %s\n"
msgstr "%s: �������� ���������: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
#, fuzzy
#| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
msgstr "��� ������� �������������� ����������: %s\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr ""
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, fuzzy, c-format
#| msgid "using cipher %s\n"
msgid "using OCSP responder '%s'\n"
msgstr "����� ��� ���������������: %s\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, fuzzy, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, fuzzy, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "��������: �� ������ ���� ���������"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr ""
@@@ -10553,33 -8355,27 +10479,33 @@@ msgstr "�������� block �������� �������
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: �������� ����������� hashtable: %s\n"
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, 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:2444
++#: dirmngr/server.c:2406
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "�������� ������������ ��� cache �����������: %s\n"
- #: dirmngr/server.c:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10604,34 -8396,24 +10530,30 @@@ msgstr "
msgid "checking CRL for"
msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
#, fuzzy
msgid "selfsigned certificate has a BAD signature"
msgstr "���������� ���� ���������"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, fuzzy, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
#, fuzzy
msgid "certificate chain is good\n"
msgstr "� ���������� %c%lu ������������\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "� DSA ������� �� ����� ���� 160 bit ���������� hash\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "�����������"
@@@ -10759,11 -8510,9 +10681,11 @@@ msgstr "
msgid "Options enforcing a passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
@@@ -10903,85 -8620,66 +10825,85 @@@ msgstr "
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
#, fuzzy
msgid "list global configuration file"
msgstr "������� ����������� ��������� \"%s\"\n"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
#, fuzzy
msgid "check global configuration file"
msgstr "������� ����������� ��������� \"%s\"\n"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "����� �� ������� ������"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "�����: gpg [��������] [������] (-h ��� �������)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
#, fuzzy
msgid "Component not found"
msgstr "��� ������� �� ������� ������"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
#, fuzzy
msgid "No argument allowed"
msgstr "������� ��� �������� �������� ��� `%s'\n"
@@@ -11035,123 -8724,98 +10957,123 @@@ msgid "
"Call a simple symmetric encryption tool\n"
msgstr ""
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "�� %s ��� ����������� �� �� %s!\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "�������� ��������� ��� �������: %s\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, fuzzy, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "�������� ����������� ��������� `%s': %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "�������� ��������� ��� %s: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "�������� �������� ��� ����������� `%s': %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
#, fuzzy
msgid "no --program option provided\n"
msgstr "��� ������������ � ������������� �������� ������������\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr ""
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr ""
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "�������� ����������� ��� %s: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "�������� ����������� ��� %s: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr ""
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr ""
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "��� ������������� � ���������� ���������� %d%s\n"
diff --cc po/en at boldquot.po
index 997f6ee,0000000..5d51fa8
mode 100644,000000..100644
--- a/po/en at boldquot.po
+++ b/po/en at boldquot.po
@@@ -1,10637 -1,0 +1,10562 @@@
+# English translations for GNU gnupg package.
+# Copyright (C) 2016 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU gnupg package.
+# Automatically generated, 2016.
+#
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# This catalog furthermore displays the text between the quotation marks in
+# bold face, assuming the VT100/XTerm escape sequences.
+#
+msgid ""
+msgstr ""
- "Project-Id-Version: GNU gnupg 2.1.14\n"
++"Project-Id-Version: GNU gnupg 2.1.15\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
- "PO-Revision-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"PO-Revision-Date: 2016-08-18 17:17+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: agent/call-pinentry.c:257
+#, 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:447
+msgid "|pinentry-label|_OK"
+msgstr "|pinentry-label|_OK"
+
+#: agent/call-pinentry.c:448
+msgid "|pinentry-label|_Cancel"
+msgstr "|pinentry-label|_Cancel"
+
+#: agent/call-pinentry.c:449
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_Yes"
+
+#: agent/call-pinentry.c:450
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_No"
+
+#: agent/call-pinentry.c:451
+msgid "|pinentry-label|PIN:"
+msgstr "|pinentry-label|PIN:"
+
+#: agent/call-pinentry.c:452
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|_Save in password manager"
+
+#: agent/call-pinentry.c:453
+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:455
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr "|pinentry-tt|Make passphrase visible"
+
+#: agent/call-pinentry.c:456
+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:736
+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:758
+msgid "pinentry.qualitybar.tooltip"
+msgstr "pinentry.qualitybar.tooltip"
+
+#: agent/call-pinentry.c:868
+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:871
+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:909 agent/call-pinentry.c:1093
+msgid "PIN:"
+msgstr "PIN:"
+
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
+msgid "Passphrase:"
+msgstr "Passphrase:"
+
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
+msgid "does not match - try again"
+msgstr "does not match - try again"
+
+#. TRANSLATORS: The string is appended to an error message in
+#. the pinentry. The %s is the actual error message, the
+#. two %d give the current and maximum number of tries.
+#: agent/call-pinentry.c:959
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr "SETERROR %s (try %d of %d)"
+
+#: agent/call-pinentry.c:971
+msgid "Repeat:"
+msgstr "Repeat:"
+
+#: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
+msgid "PIN too long"
+msgstr "PIN too long"
+
+#: agent/call-pinentry.c:1002
+msgid "Passphrase too long"
+msgstr "Passphrase too long"
+
+#: agent/call-pinentry.c:1010
+msgid "Invalid characters in PIN"
+msgstr "Invalid characters in PIN"
+
+#: agent/call-pinentry.c:1015
+msgid "PIN too short"
+msgstr "PIN too short"
+
+#: agent/call-pinentry.c:1028
+msgid "Bad PIN"
+msgstr "Bad PIN"
+
+#: agent/call-pinentry.c:1028
+msgid "Bad Passphrase"
+msgstr "Bad Passphrase"
+
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
+#, c-format
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "ssh keys greater than %d bits are not supported\n"
+
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
+#, c-format
+msgid "can't create '%s': %s\n"
+msgstr "can't create '%s': %s\n"
+
- #: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
+#, c-format
+msgid "can't open '%s': %s\n"
+msgstr "can't open '%s': %s\n"
+
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "error getting serial number of card: %s\n"
+
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
+#, c-format
+msgid "detected card with S/N: %s\n"
+msgstr "detected card with S/N: %s\n"
+
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
+#, c-format
+msgid "no authentication key for ssh on card: %s\n"
+msgstr "no authentication key for ssh on card: %s\n"
+
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
+#, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "no suitable card key found: %s\n"
+
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
+#, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "shadowing the key failed: %s\n"
+
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
+#, c-format
+msgid "error writing key: %s\n"
+msgstr "error writing key: %s\n"
+
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
+#, 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:2919
++#: agent/command-ssh.c:2746
+msgid "Allow"
+msgstr "Allow"
+
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
+msgid "Deny"
+msgstr "Deny"
+
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
+#, 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:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
+msgid "Please re-enter this passphrase"
+msgstr "Please re-enter this passphrase"
+
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
+#, 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:3712
++#: agent/command-ssh.c:3541
+#, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "failed to create stream from socket: %s\n"
+
+#: agent/divert-scd.c:92 g10/call-agent.c:1268
+msgid "Please insert the card with serial number"
+msgstr "Please insert the card with serial number"
+
+#: agent/divert-scd.c:93 g10/call-agent.c:1269
+msgid "Please remove the current card and insert the one with serial number"
+msgstr "Please remove the current card and insert the one with serial number"
+
+#: agent/divert-scd.c:204
+msgid "Admin PIN"
+msgstr "Admin PIN"
+
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:209
+msgid "PUK"
+msgstr "PUK"
+
+#: agent/divert-scd.c:216
+msgid "Reset Code"
+msgstr "Reset Code"
+
+#: agent/divert-scd.c:242
+#, c-format
+msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgstr "%s%%0A%%0AUse the reader's pinpad for input."
+
+#: agent/divert-scd.c:291
+msgid "Repeat this Reset Code"
+msgstr "Repeat this Reset Code"
+
+#: agent/divert-scd.c:293
+msgid "Repeat this PUK"
+msgstr "Repeat this PUK"
+
+#: agent/divert-scd.c:294
+msgid "Repeat this PIN"
+msgstr "Repeat this PIN"
+
+#: agent/divert-scd.c:299
+msgid "Reset Code not correctly repeated; try again"
+msgstr "Reset Code not correctly repeated; try again"
+
+#: agent/divert-scd.c:301
+msgid "PUK not correctly repeated; try again"
+msgstr "PUK not correctly repeated; try again"
+
+#: agent/divert-scd.c:302
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN not correctly repeated; try again"
+
+#: agent/divert-scd.c:314
+#, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr "Please enter the PIN%s%s%s to unlock the card"
+
+#: agent/genkey.c:110 sm/certreqgen-ui.c:394
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "error creating temporary file: %s\n"
+
+#: agent/genkey.c:117
+#, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "error writing to temporary file: %s\n"
+
+#: agent/genkey.c:158 agent/genkey.c:164
+msgid "Enter new passphrase"
+msgstr "Enter new passphrase"
+
+#: agent/genkey.c:172
+msgid "Take this one anyway"
+msgstr "Take this one anyway"
+
+#: agent/genkey.c:202
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+
+#: agent/genkey.c:204
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+
+#: agent/genkey.c:216
+msgid "Yes, protection is not needed"
+msgstr "Yes, protection is not needed"
+
+#: agent/genkey.c:233
+#, c-format
+msgid "A passphrase should be at least %u character long."
+msgid_plural "A passphrase should be at least %u characters long."
+msgstr[0] "A passphrase should be at least %u character long."
+msgstr[1] "A passphrase should be at least %u characters long."
+
+#: agent/genkey.c:252
+#, c-format
+msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
+msgid_plural ""
+"A passphrase should contain at least %u digits or%%0Aspecial characters."
+msgstr[0] ""
+"A passphrase should contain at least %u digit or%%0Aspecial character."
+msgstr[1] ""
+"A passphrase should contain at least %u digits or%%0Aspecial characters."
+
+#: agent/genkey.c:278
+#, c-format
+msgid "A passphrase may not be a known term or match%%0Acertain pattern."
+msgstr "A passphrase may not be a known term or match%%0Acertain pattern."
+
+#: agent/genkey.c:293
+msgid "Warning: You have entered an insecure passphrase."
+msgstr "Warning: You have entered an insecure passphrase."
+
+#: agent/genkey.c:480
+#, c-format
+msgid "Please enter the passphrase to%0Aprotect your new key"
+msgstr "Please enter the passphrase to%0Aprotect your new key"
+
+#: agent/genkey.c:606
+msgid "Please enter the new passphrase"
+msgstr "Please enter the new passphrase"
+
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Options:\n"
+" "
+
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
+msgid "run in daemon mode (background)"
+msgstr "run in daemon mode (background)"
+
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
+msgid "run in server mode (foreground)"
+msgstr "run in server mode (foreground)"
+
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
+msgid "verbose"
+msgstr "verbose"
+
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
+msgid "be somewhat more quiet"
+msgstr "be somewhat more quiet"
+
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
+msgid "sh-style command output"
+msgstr "sh-style command output"
+
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
+msgid "csh-style command output"
+msgstr "csh-style command output"
+
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
+msgid "|FILE|read options from FILE"
+msgstr "|FILE|read options from FILE"
+
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
+msgid "do not detach from the console"
+msgstr "do not detach from the console"
+
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
+msgid "do not grab keyboard and mouse"
+msgstr "do not grab keyboard and mouse"
+
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
+msgid "use a log file for the server"
+msgstr "use a log file for the server"
+
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|use PGM as the PIN-Entry program"
+
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|use PGM as the SCdaemon program"
+
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
+msgid "do not use the SCdaemon"
+msgstr "do not use the SCdaemon"
+
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
+msgid "|NAME|accept some commands via NAME"
+msgstr "|NAME|accept some commands via NAME"
+
- #: agent/gpg-agent.c:197
++#: agent/gpg-agent.c:196
+msgid "ignore requests to change the TTY"
+msgstr "ignore requests to change the TTY"
+
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
+msgid "ignore requests to change the X display"
+msgstr "ignore requests to change the X display"
+
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
+msgid "|N|expire cached PINs after N seconds"
+msgstr "|N|expire cached PINs after N seconds"
+
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
+msgid "do not use the PIN cache when signing"
+msgstr "do not use the PIN cache when signing"
+
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
+msgid "disallow the use of an external password cache"
+msgstr "disallow the use of an external password cache"
+
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
+msgid "disallow clients to mark keys as \"trusted\""
+msgstr "disallow clients to mark keys as “[1mtrusted[0m”"
+
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
+msgid "allow presetting passphrase"
+msgstr "allow presetting passphrase"
+
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
+msgid "disallow caller to override the pinentry"
+msgstr "disallow caller to override the pinentry"
+
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
+msgid "allow passphrase to be prompted through Emacs"
+msgstr "allow passphrase to be prompted through Emacs"
+
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
+msgid "enable ssh support"
+msgstr "enable ssh support"
+
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
+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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
+msgid "Please report bugs to <@EMAIL@>.\n"
+msgstr "Please report bugs to <@EMAIL@>.\n"
+
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
+msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
+msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
+
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
+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:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
+#, c-format
+msgid "invalid debug-level '%s' given\n"
+msgstr "invalid debug-level ‘[1m%s[0m’ given\n"
+
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr "%s is too old (need %s, have %s)\n"
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Note: no default option file ‘[1m%s[0m’\n"
+
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "option file '%s': %s\n"
+
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
+#, c-format
+msgid "reading options from '%s'\n"
+msgstr "reading options from ‘[1m%s[0m’\n"
+
- #: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
+#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
+#, c-format
+msgid "can't create socket: %s\n"
+msgstr "can't create socket: %s\n"
+
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
+#, c-format
+msgid "socket name '%s' is too long\n"
+msgstr "socket name ‘[1m%s[0m’ is too long\n"
+
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
+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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
+msgid "error getting nonce for the socket\n"
+msgstr "error getting nonce for the socket\n"
+
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
+#, c-format
+msgid "error binding socket to '%s': %s\n"
+msgstr "error binding socket to '%s': %s\n"
+
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
+#, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "can't set permissions of '%s': %s\n"
+
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
+#, c-format
+msgid "listen() failed: %s\n"
+msgstr "listen() failed: %s\n"
+
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
+#, c-format
+msgid "listening on socket '%s'\n"
+msgstr "listening on socket ‘[1m%s[0m’\n"
+
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
+#, c-format
+msgid "can't create directory '%s': %s\n"
+msgstr "can't create directory '%s': %s\n"
+
- #: agent/gpg-agent.c:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
+#, c-format
+msgid "directory '%s' created\n"
+msgstr "directory ‘[1m%s[0m’ created\n"
+
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
+#, c-format
+msgid "stat() failed for '%s': %s\n"
+msgstr "stat() failed for '%s': %s\n"
+
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
+#, 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:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
+#, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "error reading nonce on fd %d: %s\n"
+
+#: agent/gpg-agent.c:2307
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
+msgstr "handler 0x%lx for fd %d started\n"
+
+#: agent/gpg-agent.c:2312
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr "handler 0x%lx for fd %d terminated\n"
+
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
+#, 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:2390
++#: agent/gpg-agent.c:2392
+#, 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:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
+#, c-format
+msgid "npth_pselect failed: %s - waiting 1s\n"
+msgstr "npth_pselect failed: %s - waiting 1s\n"
+
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
+#, c-format
+msgid "%s %s stopped\n"
+msgstr "%s %s stopped\n"
+
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
+msgid "no gpg-agent running in this session\n"
+msgstr "no gpg-agent running in this session\n"
+
+#: agent/preset-passphrase.c:99
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+
+#: agent/preset-passphrase.c:102
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Commands:\n"
+" "
+
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Options:\n"
+" "
+
+#: agent/protect-tool.c:154
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Usage: gpg-protect-tool [options] (-h for help)\n"
+
+#: agent/protect-tool.c:156
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]\n"
+"Secret key maintenance tool\n"
+msgstr ""
+"Syntax: gpg-protect-tool [options] [args]\n"
+"Secret key maintenance tool\n"
+
- #: agent/protect-tool.c:700
++#: 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:705
++#: 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:711
++#: 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:716
++#: 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:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
+msgid "cancelled\n"
+msgstr "cancelled\n"
+
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
+#, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "error while asking for the passphrase: %s\n"
+
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
+#, 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:1453 agent/findkey.c:1467
+#: 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:252
+#, 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:268
+#, 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:282 agent/findkey.c:289
+msgid "Change passphrase"
+msgstr "Change passphrase"
+
+#: agent/findkey.c:290
+msgid "I'll change it later"
+msgstr "I'll change it later"
+
+#: agent/findkey.c:1429
+#, 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:1453 agent/findkey.c:1467
+msgid "Delete key"
+msgstr "Delete key"
+
+#: agent/findkey.c:1464
+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:204
+#, 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:512
+#, 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:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
+#, c-format
+msgid "error creating a pipe: %s\n"
+msgstr "error creating a pipe: %s\n"
+
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
+#, 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:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
+#, c-format
+msgid "error forking process: %s\n"
+msgstr "error forking process: %s\n"
+
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
+#, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "waiting for processes to terminate failed: %s\n"
+
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
+#, c-format
+msgid "error running '%s': probably not installed\n"
+msgstr "error running '%s': probably not installed\n"
+
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: 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:667
++#: common/exechelp-posix.c:665
+#, c-format
+msgid "error running '%s': terminated\n"
+msgstr "error running '%s': terminated\n"
+
+#: common/exechelp-w32.c:746 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/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/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
+#, c-format
+msgid "can't connect to '%s': %s\n"
+msgstr "can't connect to '%s': %s\n"
+
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "communication problem with gpg-agent\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
+msgid "problem setting the gpg-agent options\n"
+msgstr "problem setting the gpg-agent options\n"
+
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- msgid "canceled by user\n"
- msgstr "canceled by user\n"
-
- #: common/simple-pwquery.c:579
- msgid "problem with the agent\n"
- msgstr "problem with the agent\n"
-
- #: common/simple-pwquery.c:701
- #, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "problem with the agent (unexpected response “[1m%s[0m”)\n"
-
+#: common/sysutils.c:124
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "can't disable core dumps: %s\n"
+
+#: common/sysutils.c:219
+#, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "Warning: unsafe ownership on %s “[1m%s[0m”\n"
+
+#: common/sysutils.c:251
+#, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "Warning: unsafe permissions on %s “[1m%s[0m”\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:789 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:490
++#: common/miscellaneous.c:554
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr "unknown debug flag ‘[1m%s[0m’ ignored\n"
+
+#: common/asshelp.c:417
+#, c-format
+msgid "no running gpg-agent - starting '%s'\n"
+msgstr "no running gpg-agent - starting ‘[1m%s[0m’\n"
+
+#: common/asshelp.c:477
+#, 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:485
+msgid "connection to agent established\n"
+msgstr "connection to agent established\n"
+
+#: common/asshelp.c:525
+msgid "connection to agent is in restricted mode\n"
+msgstr "connection to agent is in restricted mode\n"
+
- #: common/asshelp.c:606
++#: common/asshelp.c:582
+#, c-format
+msgid "no running Dirmngr - starting '%s'\n"
+msgstr "no running Dirmngr - starting ‘[1m%s[0m’\n"
+
- #: common/asshelp.c:663
++#: common/asshelp.c:630
+#, 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:672
++#: common/asshelp.c:639
+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:2885
+#, 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:991
+msgid "no CRL found for certificate"
+msgstr "no CRL found for certificate"
+
+#: common/audit.c:1114 sm/certchain.c:1001
+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:893
+msgid "[none]"
+msgstr "[none]"
+
+#: common/argparse.c:365
+msgid "argument not expected"
+msgstr "argument not expected"
+
+#: common/argparse.c:367
+msgid "read error"
+msgstr "read error"
+
+#: common/argparse.c:369
+msgid "keyword too long"
+msgstr "keyword too long"
+
+#: common/argparse.c:371
+msgid "missing argument"
+msgstr "missing argument"
+
+#: common/argparse.c:373
+msgid "invalid argument"
+msgstr "invalid argument"
+
+#: common/argparse.c:375
+msgid "invalid command"
+msgstr "invalid command"
+
+#: common/argparse.c:377
+msgid "invalid alias definition"
+msgstr "invalid alias definition"
+
+#: common/argparse.c:379
+msgid "out of core"
+msgstr "out of core"
+
+#: common/argparse.c:381
+msgid "invalid option"
+msgstr "invalid option"
+
+#: common/argparse.c:389
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr "missing argument for option “[1m%.50s[0m”\n"
+
+#: common/argparse.c:391
+#, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "invalid argument for option “[1m%.50s[0m”\n"
+
+#: common/argparse.c:393
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr "option “[1m%.50s[0m” does not expect an argument\n"
+
+#: common/argparse.c:395
+#, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "invalid command “[1m%.50s[0m”\n"
+
+#: common/argparse.c:397
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr "option “[1m%.50s[0m” is ambiguous\n"
+
+#: common/argparse.c:399
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr "command “[1m%.50s[0m” is ambiguous\n"
+
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
+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:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
++#, c-format
++msgid "%s is too old (need %s, have %s)\n"
++msgstr "%s is too old (need %s, have %s)\n"
++
+#: g10/armor.c:424
+#, c-format
+msgid "armor: %s\n"
+msgstr "armor: %s\n"
+
+#: g10/armor.c:463
+msgid "invalid armor header: "
+msgstr "invalid armor header: "
+
+#: g10/armor.c:474
+msgid "armor header: "
+msgstr "armor header: "
+
+#: g10/armor.c:487
+msgid "invalid clearsig header\n"
+msgstr "invalid clearsig header\n"
+
+#: g10/armor.c:500
+msgid "unknown armor header: "
+msgstr "unknown armor header: "
+
+#: g10/armor.c:553
+msgid "nested clear text signatures\n"
+msgstr "nested clear text signatures\n"
+
+#: g10/armor.c:688
+msgid "unexpected armor: "
+msgstr "unexpected armor: "
+
+#: g10/armor.c:701
+msgid "invalid dash escaped line: "
+msgstr "invalid dash escaped line: "
+
+#: g10/armor.c:873 g10/armor.c:1490
+#, c-format
+msgid "invalid radix64 character %02X skipped\n"
+msgstr "invalid radix64 character %02X skipped\n"
+
+#: g10/armor.c:916
+msgid "premature eof (no CRC)\n"
+msgstr "premature eof (no CRC)\n"
+
+#: g10/armor.c:950
+msgid "premature eof (in CRC)\n"
+msgstr "premature eof (in CRC)\n"
+
+#: g10/armor.c:958
+msgid "malformed CRC\n"
+msgstr "malformed CRC\n"
+
+#: g10/armor.c:962 g10/armor.c:1527
+#, c-format
+msgid "CRC error; %06lX - %06lX\n"
+msgstr "CRC error; %06lX - %06lX\n"
+
+#: g10/armor.c:982
+msgid "premature eof (in trailer)\n"
+msgstr "premature eof (in trailer)\n"
+
+#: g10/armor.c:986
+msgid "error in trailer line\n"
+msgstr "error in trailer line\n"
+
+#: g10/armor.c:1303
+msgid "no valid OpenPGP data found.\n"
+msgstr "no valid OpenPGP data found.\n"
+
+#: g10/armor.c:1308
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "invalid armor: line longer than %d characters\n"
+
+#: g10/armor.c:1312
+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:1115
+#, c-format
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "[ not human readable (%zu bytes: %s%s) ]"
+
+#: g10/build-packet.c:1167
+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:1179 g10/build-packet.c:1275
+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:1185 g10/build-packet.c:1281
+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:1203
+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:1259
+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:1265
+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:1324 g10/build-packet.c:1335
+msgid "WARNING: invalid notation data found\n"
+msgstr "WARNING: invalid notation data found\n"
+
+#: g10/call-agent.c:151 sm/call-agent.c:199
+#, c-format
+msgid "failed to proxy %s inquiry to client\n"
+msgstr "failed to proxy %s inquiry to client\n"
+
+#: g10/call-agent.c:176
+msgid "Enter passphrase: "
+msgstr "Enter passphrase: "
+
+#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
+#, c-format
+msgid "error getting version from '%s': %s\n"
+msgstr "error getting version from '%s': %s\n"
+
+#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
+#, 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:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
+#, c-format
+msgid "WARNING: %s\n"
+msgstr "WARNING: %s\n"
+
+#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
+#: g10/keygen.c:4883
+#, 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:1694
+#, 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:1891 g10/delkey.c:128 g10/keyedit.c:2018
+#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
+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:2259
+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:1457 g10/card-util.c:1570
+#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
+msgid "Your selection? "
+msgstr "Your selection? "
+
+#: g10/card-util.c:279 g10/card-util.c:330
+msgid "[not set]"
+msgstr "[not set]"
+
+#: g10/card-util.c:533
+msgid "male"
+msgstr "male"
+
+#: g10/card-util.c:534
+msgid "female"
+msgstr "female"
+
+#: g10/card-util.c:534
+msgid "unspecified"
+msgstr "unspecified"
+
+#: g10/card-util.c:561
+msgid "not forced"
+msgstr "not forced"
+
+#: g10/card-util.c:561
+msgid "forced"
+msgstr "forced"
+
+#: g10/card-util.c:636
+msgid "Error: Only plain ASCII is currently allowed.\n"
+msgstr "Error: Only plain ASCII is currently allowed.\n"
+
+#: g10/card-util.c:638
+msgid "Error: The \"<\" character may not be used.\n"
+msgstr "Error: The “[1m<[0m” character may not be used.\n"
+
+#: g10/card-util.c:640
+msgid "Error: Double spaces are not allowed.\n"
+msgstr "Error: Double spaces are not allowed.\n"
+
+#: g10/card-util.c:657
+msgid "Cardholder's surname: "
+msgstr "Cardholder's surname: "
+
+#: g10/card-util.c:659
+msgid "Cardholder's given name: "
+msgstr "Cardholder's given name: "
+
+#: g10/card-util.c:677
+#, 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:698
+msgid "URL to retrieve public key: "
+msgstr "URL to retrieve public key: "
+
+#: g10/card-util.c:706
+#, c-format
+msgid "Error: URL too long (limit is %d characters).\n"
+msgstr "Error: URL too long (limit is %d characters).\n"
+
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
+#, c-format
+msgid "error reading '%s': %s\n"
+msgstr "error reading '%s': %s\n"
+
+#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
+#, c-format
+msgid "error writing '%s': %s\n"
+msgstr "error writing '%s': %s\n"
+
+#: g10/card-util.c:861
+msgid "Login data (account name): "
+msgstr "Login data (account name): "
+
+#: g10/card-util.c:871
+#, c-format
+msgid "Error: Login data too long (limit is %d characters).\n"
+msgstr "Error: Login data too long (limit is %d characters).\n"
+
+#: g10/card-util.c:907
+msgid "Private DO data: "
+msgstr "Private DO data: "
+
+#: g10/card-util.c:917
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr "Error: Private DO too long (limit is %d characters).\n"
+
+#: g10/card-util.c:1000
+msgid "Language preferences: "
+msgstr "Language preferences: "
+
+#: g10/card-util.c:1008
+msgid "Error: invalid length of preference string.\n"
+msgstr "Error: invalid length of preference string.\n"
+
+#: g10/card-util.c:1017
+msgid "Error: invalid characters in preference string.\n"
+msgstr "Error: invalid characters in preference string.\n"
+
+#: g10/card-util.c:1039
+msgid "Sex ((M)ale, (F)emale or space): "
+msgstr "Sex ((M)ale, (F)emale or space): "
+
+#: g10/card-util.c:1053
+msgid "Error: invalid response.\n"
+msgstr "Error: invalid response.\n"
+
+#: g10/card-util.c:1075
+msgid "CA fingerprint: "
+msgstr "CA fingerprint: "
+
+#: g10/card-util.c:1098
+msgid "Error: invalid formatted fingerprint.\n"
+msgstr "Error: invalid formatted fingerprint.\n"
+
+#: g10/card-util.c:1148
+#, c-format
+msgid "key operation not possible: %s\n"
+msgstr "key operation not possible: %s\n"
+
+#: g10/card-util.c:1149
+msgid "not an OpenPGP card"
+msgstr "not an OpenPGP card"
+
+#: g10/card-util.c:1162
+#, c-format
+msgid "error getting current key info: %s\n"
+msgstr "error getting current key info: %s\n"
+
+#: g10/card-util.c:1249
+msgid "Replace existing key? (y/N) "
+msgstr "Replace existing key? (y/N) "
+
+#: g10/card-util.c:1266
+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:1291
+#, 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:1293
+#, 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:1294
+#, 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:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "rounded up to %u bits\n"
+
+#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr "%s keysizes must be in the range %u-%u\n"
+
+#: g10/card-util.c:1318
+#, 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:1338
+#, 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:1362
+msgid "Make off-card backup of encryption key? (Y/n) "
+msgstr "Make off-card backup of encryption key? (Y/n) "
+
+#: g10/card-util.c:1376
+msgid "Note: keys are already stored on the card!\n"
+msgstr "Note: keys are already stored on the card!\n"
+
+#: g10/card-util.c:1379
+msgid "Replace existing keys? (y/N) "
+msgstr "Replace existing keys? (y/N) "
+
+#: g10/card-util.c:1391
+#, 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:1448
+msgid "Please select the type of key to generate:\n"
+msgstr "Please select the type of key to generate:\n"
+
+#: g10/card-util.c:1450 g10/card-util.c:1561
+msgid " (1) Signature key\n"
+msgstr " (1) Signature key\n"
+
+#: g10/card-util.c:1451 g10/card-util.c:1563
+msgid " (2) Encryption key\n"
+msgstr " (2) Encryption key\n"
+
+#: g10/card-util.c:1452 g10/card-util.c:1565
+msgid " (3) Authentication key\n"
+msgstr " (3) Authentication key\n"
+
+#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
+msgid "Invalid selection.\n"
+msgstr "Invalid selection.\n"
+
+#: g10/card-util.c:1558
+msgid "Please select where to store the key:\n"
+msgstr "Please select where to store the key:\n"
+
+#: g10/card-util.c:1604
+#, c-format
+msgid "KEYTOCARD failed: %s\n"
+msgstr "KEYTOCARD failed: %s\n"
+
+#: g10/card-util.c:1700
+msgid "This command is not supported by this card\n"
+msgstr "This command is not supported by this card\n"
+
+#: g10/card-util.c:1705
+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:1708
+msgid "Continue? (y/N) "
+msgstr "Continue? (y/N) "
+
+#: g10/card-util.c:1713
+msgid "Really do a factory reset? (enter \"yes\") "
+msgstr "Really do a factory reset? (enter “[1myes[0m”) "
+
+#: g10/card-util.c:1799 g10/keyedit.c:1856
+msgid "quit this menu"
+msgstr "quit this menu"
+
+#: g10/card-util.c:1801
+msgid "show admin commands"
+msgstr "show admin commands"
+
+#: g10/card-util.c:1802 g10/keyedit.c:1859
+msgid "show this help"
+msgstr "show this help"
+
+#: g10/card-util.c:1804
+msgid "list all available data"
+msgstr "list all available data"
+
+#: g10/card-util.c:1807
+msgid "change card holder's name"
+msgstr "change card holder's name"
+
+#: g10/card-util.c:1808
+msgid "change URL to retrieve key"
+msgstr "change URL to retrieve key"
+
+#: g10/card-util.c:1809
+msgid "fetch the key specified in the card URL"
+msgstr "fetch the key specified in the card URL"
+
+#: g10/card-util.c:1810
+msgid "change the login name"
+msgstr "change the login name"
+
+#: g10/card-util.c:1811
+msgid "change the language preferences"
+msgstr "change the language preferences"
+
+#: g10/card-util.c:1812
+msgid "change card holder's sex"
+msgstr "change card holder's sex"
+
+#: g10/card-util.c:1813
+msgid "change a CA fingerprint"
+msgstr "change a CA fingerprint"
+
+#: g10/card-util.c:1814
+msgid "toggle the signature force PIN flag"
+msgstr "toggle the signature force PIN flag"
+
+#: g10/card-util.c:1815
+msgid "generate new keys"
+msgstr "generate new keys"
+
+#: g10/card-util.c:1816
+msgid "menu to change or unblock the PIN"
+msgstr "menu to change or unblock the PIN"
+
+#: g10/card-util.c:1817
+msgid "verify the PIN and list all data"
+msgstr "verify the PIN and list all data"
+
+#: g10/card-util.c:1818
+msgid "unblock the PIN using a Reset Code"
+msgstr "unblock the PIN using a Reset Code"
+
+#: g10/card-util.c:1819
+msgid "destroy all keys and data"
+msgstr "destroy all keys and data"
+
+#: g10/card-util.c:1941
+msgid "gpg/card> "
+msgstr "gpg/card> "
+
+#: g10/card-util.c:1982
+msgid "Admin-only command\n"
+msgstr "Admin-only command\n"
+
+#: g10/card-util.c:2013
+msgid "Admin commands are allowed\n"
+msgstr "Admin commands are allowed\n"
+
+#: g10/card-util.c:2015
+msgid "Admin commands are not allowed\n"
+msgstr "Admin commands are not allowed\n"
+
+#: g10/card-util.c:2110 g10/keyedit.c:2805
+msgid "Invalid command (try \"help\")\n"
+msgstr "Invalid command (try “[1mhelp[0m”)\n"
+
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
+msgid "--output doesn't work for this command\n"
+msgstr "--output doesn't work for this command\n"
+
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
+#, c-format
+msgid "can't open '%s'\n"
+msgstr "can't open ‘[1m%s[0m’\n"
+
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
+#, 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:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "error reading keyblock: %s\n"
+
+#: g10/delkey.c:118 g10/getkey.c:579
+#, c-format
+msgid "key \"%s\" not found\n"
+msgstr "key “[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:201
+#, c-format
+msgid "deleting secret %s failed: %s\n"
+msgstr "deleting secret %s failed: %s\n"
+
+#: g10/delkey.c:203
+msgid "key"
+msgstr "key"
+
+#: g10/delkey.c:203
+msgid "subkey"
+msgstr "subkey"
+
+#: g10/delkey.c:226
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "deleting keyblock failed: %s\n"
+
+#: g10/delkey.c:239
+msgid "ownertrust information cleared\n"
+msgstr "ownertrust information cleared\n"
+
+#: g10/delkey.c:275
+#, c-format
+msgid "there is a secret key for public key \"%s\"!\n"
+msgstr "there is a secret key for public key “[1m%s[0m”!\n"
+
+#: g10/delkey.c:277
+msgid "use option \"--delete-secret-keys\" to delete it first.\n"
+msgstr "use option “[1m--delete-secret-keys[0m” to delete it first.\n"
+
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "error creating passphrase: %s\n"
+
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
+msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgstr "can't use a symmetric ESK packet due to the S2K mode\n"
+
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
+#, c-format
+msgid "using cipher %s\n"
+msgstr "using cipher %s\n"
+
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
+#, c-format
+msgid "'%s' already compressed\n"
+msgstr "‘[1m%s[0m’ already compressed\n"
+
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
+#, c-format
+msgid "WARNING: '%s' is an empty file\n"
+msgstr "WARNING: ‘[1m%s[0m’ is an empty file\n"
+
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
+#, c-format
+msgid "reading from '%s'\n"
+msgstr "reading from ‘[1m%s[0m’\n"
+
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
+#, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
+#, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
+msgstr ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
+
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s encrypted for: “[1m%s[0m”\n"
+
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "you may not use %s while in %s mode\n"
+
+#: g10/decrypt-data.c:93 g10/mainproc.c:304
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s encrypted data\n"
+
+#: g10/decrypt-data.c:96 g10/mainproc.c:308
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "encrypted with unknown algorithm %d\n"
+
+#: g10/decrypt-data.c:164 sm/decrypt.c:127
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+
+#: g10/decrypt-data.c:176
+msgid "problem handling encrypted packet\n"
+msgstr "problem handling encrypted packet\n"
+
+#: g10/exec.c:60
+msgid "no remote program execution supported\n"
+msgstr "no remote program execution supported\n"
+
+#: g10/exec.c:319
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"external program calls are disabled due to unsafe options file permissions\n"
+
+#: g10/exec.c:349
+msgid "this platform requires temporary files when calling external programs\n"
+msgstr ""
+"this platform requires temporary files when calling external programs\n"
+
+#: g10/exec.c:427
+#, c-format
+msgid "unable to execute program '%s': %s\n"
+msgstr "unable to execute program '%s': %s\n"
+
+#: g10/exec.c:430
+#, c-format
+msgid "unable to execute shell '%s': %s\n"
+msgstr "unable to execute shell '%s': %s\n"
+
+#: g10/exec.c:521
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "system error while calling external program: %s\n"
+
+#: g10/exec.c:532 g10/exec.c:599
+msgid "unnatural exit of external program\n"
+msgstr "unnatural exit of external program\n"
+
+#: g10/exec.c:547
+msgid "unable to execute external program\n"
+msgstr "unable to execute external program\n"
+
+#: g10/exec.c:564
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "unable to read external program response: %s\n"
+
+#: g10/exec.c:610 g10/exec.c:617
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
+msgstr "WARNING: unable to remove tempfile (%s) '%s': %s\n"
+
+#: g10/exec.c:622
+#, c-format
+msgid "WARNING: unable to remove temp directory '%s': %s\n"
+msgstr "WARNING: unable to remove temp directory '%s': %s\n"
+
+#: g10/export.c:102
+msgid "export signatures that are marked as local-only"
+msgstr "export signatures that are marked as local-only"
+
+#: g10/export.c:104
+msgid "export attribute user IDs (generally photo IDs)"
+msgstr "export attribute user IDs (generally photo IDs)"
+
+#: g10/export.c:106
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "export revocation keys marked as “[1msensitive[0m”"
+
+#: g10/export.c:108
+msgid "remove unusable parts from key during export"
+msgstr "remove unusable parts from key during export"
+
+#: g10/export.c:110
+msgid "remove as much as possible from key during export"
+msgstr "remove as much as possible from key during export"
+
+#: g10/export.c:1204
+msgid " - skipped"
+msgstr " - skipped"
+
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
+#, c-format
+msgid "writing to '%s'\n"
+msgstr "writing to ‘[1m%s[0m’\n"
+
+#: g10/export.c:1660
+#, c-format
+msgid "key %s: key material on-card - skipped\n"
+msgstr "key %s: key material on-card - skipped\n"
+
+#: g10/export.c:1846
+msgid "exporting secret keys not allowed\n"
+msgstr "exporting secret keys not allowed\n"
+
+#: g10/export.c:1923
+#, 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:2004
+msgid "WARNING: nothing exported\n"
+msgstr "WARNING: nothing exported\n"
+
+#: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
+#: g10/plaintext.c:151 g10/plaintext.c:174
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "error creating '%s': %s\n"
+
+#: g10/getkey.c:257
+msgid "[User ID not found]"
+msgstr "[User ID not found]"
+
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
+#, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "(check argument of option '%s')\n"
+
+#: g10/getkey.c:516
+#, c-format
+msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
+msgstr "Warning: ‘[1m%s[0m’ should be a long key ID or a fingerprint\n"
+
+#: g10/getkey.c:546
+#, c-format
+msgid "error looking up: %s\n"
+msgstr "error looking up: %s\n"
+
+#: g10/getkey.c:636
+#, c-format
+msgid "Warning: %s appears in the keyring %d times\n"
+msgstr "Warning: %s appears in the keyring %d times\n"
+
+#: g10/getkey.c:1431
+#, c-format
+msgid "automatically retrieved '%s' via %s\n"
+msgstr "automatically retrieved ‘[1m%s[0m’ via %s\n"
+
+#: g10/getkey.c:1437
+#, c-format
+msgid "error retrieving '%s' via %s: %s\n"
+msgstr "error retrieving ‘[1m%s[0m’ via %s: %s\n"
+
+#: g10/getkey.c:1439
+msgid "No fingerprint"
+msgstr "No fingerprint"
+
+#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
+#: g10/revoke.c:701
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "secret key “[1m%s[0m” not found: %s\n"
+
+#: g10/getkey.c:1735
+#, 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:1743
+#, 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:1750
+#, c-format
+msgid "all values passed to '%s' ignored\n"
+msgstr "all values passed to ‘[1m%s[0m’ ignored\n"
+
+#: g10/getkey.c:2545
+#, 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:3377
+#, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "using subkey %s instead of primary key %s\n"
+
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
+msgid "make a signature"
+msgstr "make a signature"
+
- #: g10/gpg.c:418
++#: g10/gpg.c:421
+msgid "make a clear text signature"
+msgstr "make a clear text signature"
+
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
+msgid "make a detached signature"
+msgstr "make a detached signature"
+
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
+msgid "encrypt data"
+msgstr "encrypt data"
+
- #: g10/gpg.c:422
++#: g10/gpg.c:425
+msgid "encryption only with symmetric cipher"
+msgstr "encryption only with symmetric cipher"
+
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
+msgid "decrypt data (default)"
+msgstr "decrypt data (default)"
+
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
+msgid "verify a signature"
+msgstr "verify a signature"
+
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
+msgid "list keys"
+msgstr "list keys"
+
- #: g10/gpg.c:430
++#: g10/gpg.c:433
+msgid "list keys and signatures"
+msgstr "list keys and signatures"
+
- #: g10/gpg.c:431
++#: g10/gpg.c:434
+msgid "list and check key signatures"
+msgstr "list and check key signatures"
+
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
+msgid "list keys and fingerprints"
+msgstr "list keys and fingerprints"
+
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
+msgid "list secret keys"
+msgstr "list secret keys"
+
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
+msgid "generate a new key pair"
+msgstr "generate a new key pair"
+
- #: g10/gpg.c:437
++#: g10/gpg.c:440
+msgid "quickly generate a new key pair"
+msgstr "quickly generate a new key pair"
+
- #: g10/gpg.c:439
++#: g10/gpg.c:442
+msgid "quickly add a new user-id"
+msgstr "quickly add a new user-id"
+
- #: g10/gpg.c:442
++#: g10/gpg.c:445
+msgid "quickly revoke a user-id"
+msgstr "quickly revoke a user-id"
+
- #: g10/gpg.c:444
++#: g10/gpg.c:447
+msgid "full featured key pair generation"
+msgstr "full featured key pair generation"
+
- #: g10/gpg.c:445
++#: g10/gpg.c:448
+msgid "generate a revocation certificate"
+msgstr "generate a revocation certificate"
+
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
+msgid "remove keys from the public keyring"
+msgstr "remove keys from the public keyring"
+
- #: g10/gpg.c:449
++#: g10/gpg.c:452
+msgid "remove keys from the secret keyring"
+msgstr "remove keys from the secret keyring"
+
- #: g10/gpg.c:451
++#: g10/gpg.c:454
+msgid "quickly sign a key"
+msgstr "quickly sign a key"
+
- #: g10/gpg.c:453
++#: g10/gpg.c:456
+msgid "quickly sign a key locally"
+msgstr "quickly sign a key locally"
+
- #: g10/gpg.c:454
++#: g10/gpg.c:457
+msgid "sign a key"
+msgstr "sign a key"
+
- #: g10/gpg.c:455
++#: g10/gpg.c:458
+msgid "sign a key locally"
+msgstr "sign a key locally"
+
- #: g10/gpg.c:456
++#: g10/gpg.c:459
+msgid "sign or edit a key"
+msgstr "sign or edit a key"
+
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
+msgid "change a passphrase"
+msgstr "change a passphrase"
+
- #: g10/gpg.c:460
++#: g10/gpg.c:463
+msgid "export keys"
+msgstr "export keys"
+
- #: g10/gpg.c:461
++#: g10/gpg.c:464
+msgid "export keys to a keyserver"
+msgstr "export keys to a keyserver"
+
- #: g10/gpg.c:462
++#: g10/gpg.c:465
+msgid "import keys from a keyserver"
+msgstr "import keys from a keyserver"
+
- #: g10/gpg.c:464
++#: g10/gpg.c:467
+msgid "search for keys on a keyserver"
+msgstr "search for keys on a keyserver"
+
- #: g10/gpg.c:466
++#: g10/gpg.c:469
+msgid "update all keys from a keyserver"
+msgstr "update all keys from a keyserver"
+
- #: g10/gpg.c:472
++#: g10/gpg.c:475
+msgid "import/merge keys"
+msgstr "import/merge keys"
+
- #: g10/gpg.c:475
++#: g10/gpg.c:478
+msgid "print the card status"
+msgstr "print the card status"
+
- #: g10/gpg.c:476
++#: g10/gpg.c:479
+msgid "change data on a card"
+msgstr "change data on a card"
+
- #: g10/gpg.c:477
++#: g10/gpg.c:480
+msgid "change a card's PIN"
+msgstr "change a card's PIN"
+
- #: g10/gpg.c:489
++#: g10/gpg.c:492
+msgid "update the trust database"
+msgstr "update the trust database"
+
- #: g10/gpg.c:498
++#: g10/gpg.c:501
+msgid "print message digests"
+msgstr "print message digests"
+
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
+msgid "run in server mode"
+msgstr "run in server mode"
+
- #: g10/gpg.c:503
++#: g10/gpg.c:506
+msgid "|VALUE|set the TOFU policy for a key"
+msgstr "|VALUE|set the TOFU policy for a key"
+
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
+msgid "create ascii armored output"
+msgstr "create ascii armored output"
+
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|encrypt for USER-ID"
+
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|USER-ID|use USER-ID to sign or decrypt"
+
- #: g10/gpg.c:531
++#: g10/gpg.c:535
+msgid "|N|set compress level to N (0 disables)"
+msgstr "|N|set compress level to N (0 disables)"
+
- #: g10/gpg.c:538
++#: g10/gpg.c:542
+msgid "use canonical text mode"
+msgstr "use canonical text mode"
+
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|write output to FILE"
+
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
+msgid "do not make any changes"
+msgstr "do not make any changes"
+
- #: g10/gpg.c:570
++#: g10/gpg.c:575
+msgid "prompt before overwriting"
+msgstr "prompt before overwriting"
+
- #: g10/gpg.c:618
++#: g10/gpg.c:623
+msgid "use strict OpenPGP behavior"
+msgstr "use strict OpenPGP behavior"
+
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
+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:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
+msgid ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file] sign and encrypt for user Bob\n"
+" --clearsign [file] make a clear text signature\n"
+" --detach-sign [file] make a detached signature\n"
+" --list-keys [names] show keys\n"
+" --fingerprint [names] show fingerprints\n"
+msgstr ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file] sign and encrypt for user Bob\n"
+" --clearsign [file] make a clear text signature\n"
+" --detach-sign [file] make a detached signature\n"
+" --list-keys [names] show keys\n"
+" --fingerprint [names] show fingerprints\n"
+
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
+msgid "Usage: @GPG@ [options] [files] (-h for help)"
+msgstr "Usage: @GPG@ [options] [files] (-h for help)"
+
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
+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:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Supported algorithms:\n"
+
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
+msgid "Cipher: "
+msgstr "Cipher: "
+
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
+msgid "Hash: "
+msgstr "Hash: "
+
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
+msgid "Compression: "
+msgstr "Compression: "
+
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
+#, c-format
+msgid "usage: %s [options] %s\n"
+msgstr "usage: %s [options] %s\n"
+
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
+msgid "conflicting commands\n"
+msgstr "conflicting commands\n"
+
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
+#, 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:1524
++#: g10/gpg.c:1529
+#, c-format
+msgid "WARNING: unsafe ownership on homedir '%s'\n"
+msgstr "WARNING: unsafe ownership on homedir ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
+#, 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:1530
++#: g10/gpg.c:1535
+#, c-format
+msgid "WARNING: unsafe ownership on extension '%s'\n"
+msgstr "WARNING: unsafe ownership on extension ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
+#, c-format
+msgid "WARNING: unsafe permissions on homedir '%s'\n"
+msgstr "WARNING: unsafe permissions on homedir ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
+#, 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:1542
++#: g10/gpg.c:1547
+#, c-format
+msgid "WARNING: unsafe permissions on extension '%s'\n"
+msgstr "WARNING: unsafe permissions on extension ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
+#, 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:1551
++#: g10/gpg.c:1556
+#, 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:1554
++#: g10/gpg.c:1559
+#, 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:1560
++#: g10/gpg.c:1565
+#, 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:1563
++#: g10/gpg.c:1568
+#, 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:1566
++#: g10/gpg.c:1571
+#, 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:1773
++#: g10/gpg.c:1778
+#, c-format
+msgid "unknown configuration item '%s'\n"
+msgstr "unknown configuration item ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
+msgid "display photo IDs during key listings"
+msgstr "display photo IDs during key listings"
+
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
+msgid "show key usage information during key listings"
+msgstr "show key usage information during key listings"
+
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
+msgid "show policy URLs during signature listings"
+msgstr "show policy URLs during signature listings"
+
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
+msgid "show all notations during signature listings"
+msgstr "show all notations during signature listings"
+
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
+msgid "show IETF standard notations during signature listings"
+msgstr "show IETF standard notations during signature listings"
+
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
+msgid "show user-supplied notations during signature listings"
+msgstr "show user-supplied notations during signature listings"
+
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
+msgid "show preferred keyserver URLs during signature listings"
+msgstr "show preferred keyserver URLs during signature listings"
+
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
+msgid "show user ID validity during key listings"
+msgstr "show user ID validity during key listings"
+
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
+msgid "show revoked and expired user IDs in key listings"
+msgstr "show revoked and expired user IDs in key listings"
+
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
+msgid "show revoked and expired subkeys in key listings"
+msgstr "show revoked and expired subkeys in key listings"
+
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
+msgid "show the keyring name in key listings"
+msgstr "show the keyring name in key listings"
+
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
+msgid "show expiration dates during signature listings"
+msgstr "show expiration dates during signature listings"
+
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
+msgid "available TOFU policies:\n"
+msgstr "available TOFU policies:\n"
+
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
+#, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "unknown TOFU policy ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
+msgid "(use \"help\" to list choices)\n"
+msgstr "(use “[1mhelp[0m” to list choices)\n"
+
- #: g10/gpg.c:2041
- #, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "unknown TOFU DB format ‘[1m%s[0m’\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
+#, 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:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr "libgcrypt is too old (need %s, have %s)\n"
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
+#, c-format
+msgid "Note: %s is not for normal use!\n"
+msgstr "Note: %s is not for normal use!\n"
+
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
+#, 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:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
++#, 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:2949 sm/gpgsm.c:1163
+#, c-format
+msgid "invalid pinentry mode '%s'\n"
+msgstr "invalid pinentry mode ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
+#, 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:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
+msgid "could not parse keyserver URL\n"
+msgstr "could not parse keyserver URL\n"
+
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: invalid keyserver options\n"
+
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
+msgid "invalid keyserver options\n"
+msgstr "invalid keyserver options\n"
+
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: invalid import options\n"
+
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
+msgid "invalid import options\n"
+msgstr "invalid import options\n"
+
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
+#, c-format
+msgid "invalid filter option: %s\n"
+msgstr "invalid filter option: %s\n"
+
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: invalid export options\n"
+
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
+msgid "invalid export options\n"
+msgstr "invalid export options\n"
+
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
+#, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: invalid list options\n"
+
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
+msgid "invalid list options\n"
+msgstr "invalid list options\n"
+
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
+msgid "display photo IDs during signature verification"
+msgstr "display photo IDs during signature verification"
+
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
+msgid "show policy URLs during signature verification"
+msgstr "show policy URLs during signature verification"
+
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
+msgid "show all notations during signature verification"
+msgstr "show all notations during signature verification"
+
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
+msgid "show IETF standard notations during signature verification"
+msgstr "show IETF standard notations during signature verification"
+
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
+msgid "show user-supplied notations during signature verification"
+msgstr "show user-supplied notations during signature verification"
+
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "show preferred keyserver URLs during signature verification"
+
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
+msgid "show user ID validity during signature verification"
+msgstr "show user ID validity during signature verification"
+
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
+msgid "show revoked and expired user IDs in signature verification"
+msgstr "show revoked and expired user IDs in signature verification"
+
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
+msgid "show only the primary user ID in signature verification"
+msgstr "show only the primary user ID in signature verification"
+
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
+msgid "validate signatures with PKA data"
+msgstr "validate signatures with PKA data"
+
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr "elevate the trust of signatures with valid PKA data"
+
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
+#, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: invalid verify options\n"
+
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
+msgid "invalid verify options\n"
+msgstr "invalid verify options\n"
+
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "unable to set exec-path to %s\n"
+
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
+#, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
+msgid "invalid auto-key-locate list\n"
+msgstr "invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
+msgid "WARNING: program may create a core file!\n"
+msgstr "WARNING: program may create a core file!\n"
+
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "WARNING: %s overrides %s\n"
+
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s not allowed with %s!\n"
+
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s makes no sense with %s!\n"
+
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
+msgid "WARNING: running with faked system time: "
+msgstr "WARNING: running with faked system time: "
+
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
+#, 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:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
+msgid "selected cipher algorithm is invalid\n"
+msgstr "selected cipher algorithm is invalid\n"
+
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
+msgid "selected digest algorithm is invalid\n"
+msgstr "selected digest algorithm is invalid\n"
+
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
+msgid "selected compression algorithm is invalid\n"
+msgstr "selected compression algorithm is invalid\n"
+
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "selected certification digest algorithm is invalid\n"
+
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed must be greater than 0\n"
+
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed must be greater than 1\n"
+
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
+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:3599
++#: g10/gpg.c:3588
+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:3601
++#: g10/gpg.c:3590
+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:3604
++#: g10/gpg.c:3593
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
+msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
+
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
+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:3615
++#: g10/gpg.c:3604
+msgid "invalid default preferences\n"
+msgstr "invalid default preferences\n"
+
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
+msgid "invalid personal cipher preferences\n"
+msgstr "invalid personal cipher preferences\n"
+
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
+msgid "invalid personal digest preferences\n"
+msgstr "invalid personal digest preferences\n"
+
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
+msgid "invalid personal compress preferences\n"
+msgstr "invalid personal compress preferences\n"
+
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s does not yet work with %s\n"
+
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
+#, c-format
+msgid "you may not use cipher algorithm '%s' while in %s mode\n"
+msgstr "you may not use cipher algorithm ‘[1m%s[0m’ while in %s mode\n"
+
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
+#, c-format
+msgid "you may not use digest algorithm '%s' while in %s mode\n"
+msgstr "you may not use digest algorithm ‘[1m%s[0m’ while in %s mode\n"
+
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
+#, c-format
+msgid "you may not use compression algorithm '%s' while in %s mode\n"
+msgstr "you may not use compression algorithm ‘[1m%s[0m’ while in %s mode\n"
+
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "failed to initialize the TrustDB: %s\n"
+
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
+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:3883
++#: g10/gpg.c:3872
+msgid "--store [filename]"
+msgstr "--store [filename]"
+
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
+msgid "--symmetric [filename]"
+msgstr "--symmetric [filename]"
+
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
+#, c-format
+msgid "symmetric encryption of '%s' failed: %s\n"
+msgstr "symmetric encryption of ‘[1m%s[0m’ failed: %s\n"
+
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
+msgid "--encrypt [filename]"
+msgstr "--encrypt [filename]"
+
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
+msgid "--symmetric --encrypt [filename]"
+msgstr "--symmetric --encrypt [filename]"
+
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
+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:3929
++#: g10/gpg.c:3918
+#, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "you cannot use --symmetric --encrypt while in %s mode\n"
+
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
+msgid "--sign [filename]"
+msgstr "--sign [filename]"
+
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [filename]"
+
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--symmetric --sign --encrypt [filename]"
+
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
+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:3989
++#: g10/gpg.c:3978
+#, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [filename]"
+
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
+msgid "--clearsign [filename]"
+msgstr "--clearsign [filename]"
+
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
+msgid "--decrypt [filename]"
+msgstr "--decrypt [filename]"
+
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
+msgid "--sign-key user-id"
+msgstr "--sign-key user-id"
+
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
+msgid "--lsign-key user-id"
+msgstr "--lsign-key user-id"
+
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key user-id [commands]"
+
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
+msgid "--passwd <user-id>"
+msgstr "--passwd <user-id>"
+
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "keyserver send failed: %s\n"
+
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "keyserver receive failed: %s\n"
+
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "key export failed: %s\n"
+
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
+#, c-format
+msgid "export as ssh key failed: %s\n"
+msgstr "export as ssh key failed: %s\n"
+
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "keyserver search failed: %s\n"
+
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "keyserver refresh failed: %s\n"
+
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "dearmoring failed: %s\n"
+
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "enarmoring failed: %s\n"
+
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
+#, c-format
+msgid "invalid hash algorithm '%s'\n"
+msgstr "invalid hash algorithm ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
+#, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "error parsing key specification '%s': %s\n"
+
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
+#, 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:4740
++#: g10/gpg.c:4729
+msgid "[filename]"
+msgstr "[filename]"
+
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
+msgid "Go ahead and type your message ...\n"
+msgstr "Go ahead and type your message ...\n"
+
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
+msgid "the given certification policy URL is invalid\n"
+msgstr "the given certification policy URL is invalid\n"
+
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
+msgid "the given signature policy URL is invalid\n"
+msgstr "the given signature policy URL is invalid\n"
+
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
+msgid "the given preferred keyserver URL is invalid\n"
+msgstr "the given preferred keyserver URL is invalid\n"
+
+#: g10/gpgv.c:75
+msgid "|FILE|take the keys from the keyring FILE"
+msgstr "|FILE|take the keys from the keyring FILE"
+
+#: g10/gpgv.c:77
+msgid "make timestamp conflicts only a warning"
+msgstr "make timestamp conflicts only a warning"
+
+#: g10/gpgv.c:79 sm/gpgsm.c:343
+msgid "|FD|write status info to this FD"
+msgstr "|FD|write status info to this FD"
+
+#: g10/gpgv.c:83
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr "|ALGO|reject signatures made with ALGO"
+
+#: g10/gpgv.c:120
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Usage: gpgv [options] [files] (-h for help)"
+
+#: g10/gpgv.c:122
+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:134
++#: g10/import.c:138
+msgid "import signatures that are marked as local-only"
+msgstr "import signatures that are marked as local-only"
+
- #: g10/import.c:137
++#: g10/import.c:141
+msgid "repair damage from the pks keyserver during import"
+msgstr "repair damage from the pks keyserver during import"
+
- #: g10/import.c:140
++#: g10/import.c:144
+msgid "do not clear the ownertrust values during import"
+msgstr "do not clear the ownertrust values during import"
+
- #: g10/import.c:143
++#: g10/import.c:147
+msgid "do not update the trustdb after import"
+msgstr "do not update the trustdb after import"
+
- #: g10/import.c:146
++#: g10/import.c:150
+msgid "show key during import"
+msgstr "show key during import"
+
- #: g10/import.c:149
++#: g10/import.c:153
+msgid "only accept updates to existing keys"
+msgstr "only accept updates to existing keys"
+
- #: g10/import.c:152
++#: g10/import.c:156
+msgid "remove unusable parts from key after import"
+msgstr "remove unusable parts from key after import"
+
- #: g10/import.c:155
++#: g10/import.c:159
+msgid "remove as much as possible from key after import"
+msgstr "remove as much as possible from key after import"
+
- #: g10/import.c:158
++#: g10/import.c:162
+msgid "run import filters and export key immediately"
+msgstr "run import filters and export key immediately"
+
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "skipping block of type %d\n"
+
- #: g10/import.c:536
++#: g10/import.c:542
+#, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu keys processed so far\n"
+
- #: g10/import.c:606
++#: g10/import.c:612
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Total number processed: %lu\n"
+
- #: g10/import.c:609
++#: g10/import.c:615
+#, c-format
+msgid " skipped PGP-2 keys: %lu\n"
+msgstr " skipped PGP-2 keys: %lu\n"
+
- #: g10/import.c:611
++#: g10/import.c:617
+#, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " skipped new keys: %lu\n"
+
- #: g10/import.c:614
++#: g10/import.c:620
+#, c-format
+msgid " w/o user IDs: %lu\n"
+msgstr " w/o user IDs: %lu\n"
+
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
+#, c-format
+msgid " imported: %lu"
+msgstr " imported: %lu"
+
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
+#, c-format
+msgid " unchanged: %lu\n"
+msgstr " unchanged: %lu\n"
+
- #: g10/import.c:623
++#: g10/import.c:629
+#, c-format
+msgid " new user IDs: %lu\n"
+msgstr " new user IDs: %lu\n"
+
- #: g10/import.c:625
++#: g10/import.c:631
+#, c-format
+msgid " new subkeys: %lu\n"
+msgstr " new subkeys: %lu\n"
+
- #: g10/import.c:627
++#: g10/import.c:633
+#, c-format
+msgid " new signatures: %lu\n"
+msgstr " new signatures: %lu\n"
+
- #: g10/import.c:629
++#: g10/import.c:635
+#, c-format
+msgid " new key revocations: %lu\n"
+msgstr " new key revocations: %lu\n"
+
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
+#, c-format
+msgid " secret keys read: %lu\n"
+msgstr " secret keys read: %lu\n"
+
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
+#, c-format
+msgid " secret keys imported: %lu\n"
+msgstr " secret keys imported: %lu\n"
+
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr " secret keys unchanged: %lu\n"
+
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
+#, c-format
+msgid " not imported: %lu\n"
+msgstr " not imported: %lu\n"
+
- #: g10/import.c:639
++#: g10/import.c:645
+#, c-format
+msgid " signatures cleaned: %lu\n"
+msgstr " signatures cleaned: %lu\n"
+
- #: g10/import.c:641
++#: g10/import.c:647
+#, c-format
+msgid " user IDs cleaned: %lu\n"
+msgstr " user IDs cleaned: %lu\n"
+
- #: g10/import.c:985
++#: g10/import.c:991
+#, 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:1027
++#: g10/import.c:1033
+#, c-format
+msgid " \"%s\": preference for cipher algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for cipher algorithm %s\n"
+
- #: g10/import.c:1042
++#: g10/import.c:1048
+#, c-format
+msgid " \"%s\": preference for digest algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for digest algorithm %s\n"
+
- #: g10/import.c:1054
++#: g10/import.c:1060
+#, c-format
+msgid " \"%s\": preference for compression algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for compression algorithm %s\n"
+
- #: g10/import.c:1067
++#: g10/import.c:1073
+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:1069
++#: g10/import.c:1075
+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:1094
++#: g10/import.c:1100
+#, 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:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
+#, c-format
+msgid "key %s: no user ID\n"
+msgstr "key %s: no user ID\n"
+
- #: g10/import.c:1233
++#: g10/import.c:1312
+#, c-format
+msgid "key %s: %s\n"
+msgstr "key %s: %s\n"
+
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
+msgid "rejected by import screener"
+msgstr "rejected by import screener"
+
- #: g10/import.c:1264
++#: g10/import.c:1343
+#, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "key %s: PKS subkey corruption repaired\n"
+
- #: g10/import.c:1282
++#: g10/import.c:1361
+#, 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:1292
++#: g10/import.c:1371
+#, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "key %s: no valid user IDs\n"
+
- #: g10/import.c:1294
++#: g10/import.c:1373
+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:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
+#, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "key %s: public key not found: %s\n"
+
- #: g10/import.c:1353
++#: g10/import.c:1437
+#, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "key %s: new key - skipped\n"
+
- #: g10/import.c:1368
++#: g10/import.c:1452
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "no writable keyring found: %s\n"
+
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
+#, c-format
+msgid "error writing keyring '%s': %s\n"
+msgstr "error writing keyring '%s': %s\n"
+
- #: g10/import.c:1397
++#: g10/import.c:1481
+#, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "key %s: public key “[1m%s[0m” imported\n"
+
- #: g10/import.c:1421
++#: g10/import.c:1505
+#, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "key %s: doesn't match our copy\n"
+
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
+#, 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:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
+#, 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:1488
++#: g10/import.c:1572
+#, 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:1491
++#: g10/import.c:1575
+#, 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:1494
++#: g10/import.c:1578
+#, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "key %s: “[1m%s[0m” 1 new signature\n"
+
- #: g10/import.c:1497
++#: g10/import.c:1581
+#, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "key %s: “[1m%s[0m” %d new signatures\n"
+
- #: g10/import.c:1500
++#: g10/import.c:1584
+#, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %s: “[1m%s[0m” 1 new subkey\n"
+
- #: g10/import.c:1503
++#: g10/import.c:1587
+#, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %s: “[1m%s[0m” %d new subkeys\n"
+
- #: g10/import.c:1506
++#: g10/import.c:1590
+#, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "key %s: “[1m%s[0m” %d signature cleaned\n"
+
- #: g10/import.c:1509
++#: g10/import.c:1593
+#, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "key %s: “[1m%s[0m” %d signatures cleaned\n"
+
- #: g10/import.c:1512
++#: g10/import.c:1596
+#, 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:1515
++#: g10/import.c:1599
+#, 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:1538
++#: g10/import.c:1622
+#, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "key %s: “[1m%s[0m” not changed\n"
+
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
+#, c-format
+msgid "key %s: secret key imported\n"
+msgstr "key %s: secret key imported\n"
+
- #: g10/import.c:1858
++#: g10/import.c:1942
+#, c-format
+msgid "key %s: secret key already exists\n"
+msgstr "key %s: secret key already exists\n"
+
- #: g10/import.c:1866
++#: g10/import.c:1950
+#, c-format
+msgid "key %s: error sending to agent: %s\n"
+msgstr "key %s: error sending to agent: %s\n"
+
- #: g10/import.c:1971
++#: g10/import.c:2055
+#, c-format
+msgid "secret key %s: %s\n"
+msgstr "secret key %s: %s\n"
+
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
+msgid "importing secret keys not allowed\n"
+msgstr "importing secret keys not allowed\n"
+
- #: g10/import.c:2015
++#: g10/import.c:2099
+#, 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:2084
++#: g10/import.c:2171
+#, 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:2133
++#: g10/import.c:2226
+#, 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:2182
++#: g10/import.c:2275
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "key %s: invalid revocation certificate: %s - rejected\n"
+
- #: g10/import.c:2215
++#: g10/import.c:2308
+#, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "key %s: “[1m%s[0m” revocation certificate imported\n"
+
- #: g10/import.c:2291
++#: g10/import.c:2384
+#, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "key %s: no user ID for signature\n"
+
- #: g10/import.c:2308
++#: g10/import.c:2401
+#, 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:2310
++#: g10/import.c:2403
+#, 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:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
+#, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "key %s: unsupported public key algorithm\n"
+
- #: g10/import.c:2328
++#: g10/import.c:2421
+#, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "key %s: invalid direct key signature\n"
+
- #: g10/import.c:2342
++#: g10/import.c:2435
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "key %s: no subkey for key binding\n"
+
- #: g10/import.c:2355
++#: g10/import.c:2448
+#, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "key %s: invalid subkey binding\n"
+
- #: g10/import.c:2371
++#: g10/import.c:2464
+#, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "key %s: removed multiple subkey binding\n"
+
- #: g10/import.c:2393
++#: g10/import.c:2486
+#, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "key %s: no subkey for key revocation\n"
+
- #: g10/import.c:2406
++#: g10/import.c:2499
+#, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "key %s: invalid subkey revocation\n"
+
- #: g10/import.c:2421
++#: g10/import.c:2514
+#, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "key %s: removed multiple subkey revocation\n"
+
- #: g10/import.c:2463
++#: g10/import.c:2556
+#, c-format
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "key %s: skipped user ID “[1m%s[0m”\n"
+
- #: g10/import.c:2487
++#: g10/import.c:2580
+#, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "key %s: skipped subkey\n"
+
- #: g10/import.c:2516
++#: g10/import.c:2609
+#, 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:2527
++#: g10/import.c:2620
+#, 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:2545
++#: g10/import.c:2638
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "key %s: invalid revocation certificate: %s - skipped\n"
+
- #: g10/import.c:2559
++#: g10/import.c:2652
+#, 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:2567
++#: g10/import.c:2660
+#, 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:2696
++#: g10/import.c:2789
+#, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %s: duplicated user ID detected - merged\n"
+
- #: g10/import.c:2760
++#: g10/import.c:2853
+#, 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:2776
++#: g10/import.c:2869
+#, 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:2840
++#: g10/import.c:2933
+#, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "key %s: “[1m%s[0m” revocation certificate added\n"
+
- #: g10/import.c:2878
++#: g10/import.c:2971
+#, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "key %s: direct key signature added\n"
+
+#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
+#, c-format
+msgid "error creating keybox '%s': %s\n"
+msgstr "error creating keybox '%s': %s\n"
+
+#: g10/keydb.c:405 g10/keydb.c:432
+#, c-format
+msgid "error creating keyring '%s': %s\n"
+msgstr "error creating keyring '%s': %s\n"
+
+#: g10/keydb.c:441 sm/keydb.c:229
+#, c-format
+msgid "keybox '%s' created\n"
+msgstr "keybox ‘[1m%s[0m’ created\n"
+
+#: g10/keydb.c:443
+#, c-format
+msgid "keyring '%s' created\n"
+msgstr "keyring ‘[1m%s[0m’ created\n"
+
+#: g10/keydb.c:822
+#, c-format
+msgid "keyblock resource '%s': %s\n"
+msgstr "keyblock resource '%s': %s\n"
+
+#: g10/keydb.c:907
+#, c-format
+msgid "error opening key DB: %s\n"
+msgstr "error opening key DB: %s\n"
+
+#: g10/keydb.c:1778
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "failed to rebuild keyring cache: %s\n"
+
+#: g10/keyedit.c:264
+msgid "[revocation]"
+msgstr "[revocation]"
+
+#: g10/keyedit.c:264
+msgid "[self-signature]"
+msgstr "[self-signature]"
+
+#: g10/keyedit.c:618
+#, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr ""
+"can't check signature with unsupported public-key algorithm (%d): %s.\n"
+
+#: g10/keyedit.c:627
+#, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+
+#: g10/keyedit.c:789
+msgid " (reordered signatures follow)"
+msgstr " (reordered signatures follow)"
+
+#: g10/keyedit.c:902
+#, c-format
+msgid "key %s:\n"
+msgstr "key %s:\n"
+
+#: g10/keyedit.c:905
+#, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "%d duplicate signature removed\n"
+msgstr[1] "%d duplicate signatures removed\n"
+
+#: g10/keyedit.c:908 g10/keylist.c:480
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "%d signature not checked due to a missing key\n"
+msgstr[1] "%d signatures not checked due to missing keys\n"
+
+#: g10/keyedit.c:912 g10/keylist.c:476
+#, c-format
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d bad signature\n"
+msgstr[1] "%d bad signatures\n"
+
+#: g10/keyedit.c:916
+#, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "%d signature reordered\n"
+msgstr[1] "%d signatures reordered\n"
+
+#: g10/keyedit.c:921
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+"Warning: errors found and only checked self-signatures, run ‘[1m%s[0m’ to "
+"check all signatures.\n"
+
+#: g10/keyedit.c:981 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:985 g10/pkclist.c:286
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = I trust marginally\n"
+
+#: g10/keyedit.c:986 g10/pkclist.c:288
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = I trust fully\n"
+
+#: g10/keyedit.c:1004
+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:1021
+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:1149
+#, 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:1157
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "User ID “[1m%s[0m” is revoked."
+
+#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
+#: g10/keyedit.c:2235
+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:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
+#: g10/keyedit.c:2240 g10/keyedit.c:3164
+msgid " Unable to sign.\n"
+msgstr " Unable to sign.\n"
+
+#: g10/keyedit.c:1185
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User ID “[1m%s[0m” is expired."
+
+#: g10/keyedit.c:1213
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "User ID “[1m%s[0m” is not self-signed."
+
+#: g10/keyedit.c:1242
+#, c-format
+msgid "User ID \"%s\" is signable. "
+msgstr "User ID “[1m%s[0m” is signable. "
+
+#: g10/keyedit.c:1244
+msgid "Sign it? (y/N) "
+msgstr "Sign it? (y/N) "
+
+#: g10/keyedit.c:1271
+#, 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:1280
+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:1293
+#, 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:1298
+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:1319
+#, 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:1324
+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:1344
+#, 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:1348
+#, 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:1353
+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:1375
+#, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Nothing to sign with key %s\n"
+
+#: g10/keyedit.c:1399
+msgid "This key has expired!"
+msgstr "This key has expired!"
+
+#: g10/keyedit.c:1417
+#, 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:1423
+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:1464
+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:1469
+#, c-format
+msgid " (0) I will not answer.%s\n"
+msgstr " (0) I will not answer.%s\n"
+
+#: g10/keyedit.c:1471
+#, 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:1473
+#, c-format
+msgid " (2) I have done casual checking.%s\n"
+msgstr " (2) I have done casual checking.%s\n"
+
+#: g10/keyedit.c:1476
+#, 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:1483
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Your selection? (enter ‘[1m?[0m’ for more information): "
+
+#: g10/keyedit.c:1510
+#, 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:1518
+msgid "This will be a self-signature.\n"
+msgstr "This will be a self-signature.\n"
+
+#: g10/keyedit.c:1523
+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:1530
+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:1540
+msgid "The signature will be marked as non-exportable.\n"
+msgstr "The signature will be marked as non-exportable.\n"
+
+#: g10/keyedit.c:1547
+msgid "The signature will be marked as non-revocable.\n"
+msgstr "The signature will be marked as non-revocable.\n"
+
+#: g10/keyedit.c:1554
+msgid "I have not checked this key at all.\n"
+msgstr "I have not checked this key at all.\n"
+
+#: g10/keyedit.c:1559
+msgid "I have checked this key casually.\n"
+msgstr "I have checked this key casually.\n"
+
+#: g10/keyedit.c:1564
+msgid "I have checked this key very carefully.\n"
+msgstr "I have checked this key very carefully.\n"
+
+#: g10/keyedit.c:1576
+msgid "Really sign? (y/N) "
+msgstr "Really sign? (y/N) "
+
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "signing failed: %s\n"
+
+#: g10/keyedit.c:1714
+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:1744
+#, c-format
+msgid "key %s: error changing passphrase: %s\n"
+msgstr "key %s: error changing passphrase: %s\n"
+
+#: g10/keyedit.c:1858
+msgid "save and quit"
+msgstr "save and quit"
+
+#: g10/keyedit.c:1861
+msgid "show key fingerprint"
+msgstr "show key fingerprint"
+
+#: g10/keyedit.c:1862
+msgid "show the keygrip"
+msgstr "show the keygrip"
+
+#: g10/keyedit.c:1863
+msgid "list key and user IDs"
+msgstr "list key and user IDs"
+
+#: g10/keyedit.c:1865
+msgid "select user ID N"
+msgstr "select user ID N"
+
+#: g10/keyedit.c:1866
+msgid "select subkey N"
+msgstr "select subkey N"
+
+#: g10/keyedit.c:1867
+msgid "check signatures"
+msgstr "check signatures"
+
+#: g10/keyedit.c:1873
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr "sign selected user IDs [* see below for related commands]"
+
+#: g10/keyedit.c:1878
+msgid "sign selected user IDs locally"
+msgstr "sign selected user IDs locally"
+
+#: g10/keyedit.c:1879
+msgid "sign selected user IDs with a trust signature"
+msgstr "sign selected user IDs with a trust signature"
+
+#: g10/keyedit.c:1881
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr "sign selected user IDs with a non-revocable signature"
+
+#: g10/keyedit.c:1883
+msgid "add a user ID"
+msgstr "add a user ID"
+
+#: g10/keyedit.c:1885
+msgid "add a photo ID"
+msgstr "add a photo ID"
+
+#: g10/keyedit.c:1886
+msgid "delete selected user IDs"
+msgstr "delete selected user IDs"
+
+#: g10/keyedit.c:1889
+msgid "add a subkey"
+msgstr "add a subkey"
+
+#: g10/keyedit.c:1892
+msgid "add a key to a smartcard"
+msgstr "add a key to a smartcard"
+
+#: g10/keyedit.c:1894
+msgid "move a key to a smartcard"
+msgstr "move a key to a smartcard"
+
+#: g10/keyedit.c:1896
+msgid "move a backup key to a smartcard"
+msgstr "move a backup key to a smartcard"
+
+#: g10/keyedit.c:1898
+msgid "delete selected subkeys"
+msgstr "delete selected subkeys"
+
+#: g10/keyedit.c:1900
+msgid "add a revocation key"
+msgstr "add a revocation key"
+
+#: g10/keyedit.c:1902
+msgid "delete signatures from the selected user IDs"
+msgstr "delete signatures from the selected user IDs"
+
+#: g10/keyedit.c:1904
+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:1906
+msgid "flag the selected user ID as primary"
+msgstr "flag the selected user ID as primary"
+
+#: g10/keyedit.c:1909
+msgid "list preferences (expert)"
+msgstr "list preferences (expert)"
+
+#: g10/keyedit.c:1910
+msgid "list preferences (verbose)"
+msgstr "list preferences (verbose)"
+
+#: g10/keyedit.c:1912
+msgid "set preference list for the selected user IDs"
+msgstr "set preference list for the selected user IDs"
+
+#: g10/keyedit.c:1915
+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:1917
+msgid "set a notation for the selected user IDs"
+msgstr "set a notation for the selected user IDs"
+
+#: g10/keyedit.c:1919
+msgid "change the passphrase"
+msgstr "change the passphrase"
+
+#: g10/keyedit.c:1922
+msgid "change the ownertrust"
+msgstr "change the ownertrust"
+
+#: g10/keyedit.c:1925
+msgid "revoke signatures on the selected user IDs"
+msgstr "revoke signatures on the selected user IDs"
+
+#: g10/keyedit.c:1927
+msgid "revoke selected user IDs"
+msgstr "revoke selected user IDs"
+
+#: g10/keyedit.c:1930
+msgid "revoke key or selected subkeys"
+msgstr "revoke key or selected subkeys"
+
+#: g10/keyedit.c:1932
+msgid "enable key"
+msgstr "enable key"
+
+#: g10/keyedit.c:1933
+msgid "disable key"
+msgstr "disable key"
+
+#: g10/keyedit.c:1935
+msgid "show selected photo IDs"
+msgstr "show selected photo IDs"
+
+#: g10/keyedit.c:1937
+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:1939
+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:2051
+msgid "Secret key is available.\n"
+msgstr "Secret key is available.\n"
+
+#: g10/keyedit.c:2151
+msgid "Need the secret key to do this.\n"
+msgstr "Need the secret key to do this.\n"
+
+#: g10/keyedit.c:2172
+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:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
+msgid "Key is revoked."
+msgstr "Key is revoked."
+
+#: g10/keyedit.c:2251
+msgid "Really sign all user IDs? (y/N) "
+msgstr "Really sign all user IDs? (y/N) "
+
+#: g10/keyedit.c:2255
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Really sign all text user IDs? (y/N) "
+
+#: g10/keyedit.c:2263
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Hint: Select the user IDs to sign\n"
+
+#: g10/keyedit.c:2274
+#, c-format
+msgid "Unknown signature type '%s'\n"
+msgstr "Unknown signature type ‘[1m%s[0m’\n"
+
+#: g10/keyedit.c:2298
+#, 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:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
+msgid "You must select at least one user ID.\n"
+msgstr "You must select at least one user ID.\n"
+
+#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
+#, c-format
+msgid "(Use the '%s' command.)\n"
+msgstr "(Use the ‘[1m%s[0m’ command.)\n"
+
+#: g10/keyedit.c:2325
+msgid "You can't delete the last user ID!\n"
+msgstr "You can't delete the last user ID!\n"
+
+#: g10/keyedit.c:2328
+msgid "Really remove all selected user IDs? (y/N) "
+msgstr "Really remove all selected user IDs? (y/N) "
+
+#: g10/keyedit.c:2329
+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:2386
+msgid "Really move the primary key? (y/N) "
+msgstr "Really move the primary key? (y/N) "
+
+#: g10/keyedit.c:2398 g10/keyedit.c:4850
+msgid "You must select exactly one key.\n"
+msgstr "You must select exactly one key.\n"
+
+#: g10/keyedit.c:2425
+msgid "Command expects a filename argument\n"
+msgstr "Command expects a filename argument\n"
+
+#: g10/keyedit.c:2446
+#, c-format
+msgid "Can't open '%s': %s\n"
+msgstr "Can't open '%s': %s\n"
+
+#: g10/keyedit.c:2463
+#, c-format
+msgid "Error reading backup key from '%s': %s\n"
+msgstr "Error reading backup key from '%s': %s\n"
+
+#: g10/keyedit.c:2498
+msgid "You must select at least one key.\n"
+msgstr "You must select at least one key.\n"
+
+#: g10/keyedit.c:2504
+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:2506
+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:2544
+msgid "Really revoke all selected user IDs? (y/N) "
+msgstr "Really revoke all selected user IDs? (y/N) "
+
+#: g10/keyedit.c:2545
+msgid "Really revoke this user ID? (y/N) "
+msgstr "Really revoke this user ID? (y/N) "
+
+#: g10/keyedit.c:2563
+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:2574
+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:2576
+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:2634
+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:2679
+msgid "Set preference list to:\n"
+msgstr "Set preference list to:\n"
+
+#: g10/keyedit.c:2686
+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:2688
+msgid "Really update the preferences? (y/N) "
+msgstr "Really update the preferences? (y/N) "
+
+#: g10/keyedit.c:2762
+msgid "Save changes? (y/N) "
+msgstr "Save changes? (y/N) "
+
+#: g10/keyedit.c:2766
+msgid "Quit without saving? (y/N) "
+msgstr "Quit without saving? (y/N) "
+
+#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
+#: g10/keyedit.c:3254 g10/keyedit.c:3319
+#, c-format
+msgid "update failed: %s\n"
+msgstr "update failed: %s\n"
+
+#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
+msgid "Key not changed so no update needed.\n"
+msgstr "Key not changed so no update needed.\n"
+
+#: g10/keyedit.c:3025
+#, c-format
+msgid "User ID revocation failed: %s\n"
+msgstr "User ID revocation failed: %s\n"
+
+#: g10/keyedit.c:3070
+#, c-format
+msgid "\"%s\" is not a fingerprint\n"
+msgstr "“[1m%s[0m” is not a fingerprint\n"
+
+#: g10/keyedit.c:3099
+#, c-format
+msgid "\"%s\" is not the primary fingerprint\n"
+msgstr "“[1m%s[0m” is not the primary fingerprint\n"
+
+#: g10/keyedit.c:3235 g10/keyedit.c:3238
+#, c-format
+msgid "Invalid user ID '%s': %s\n"
+msgstr "Invalid user ID '%s': %s\n"
+
+#: g10/keyedit.c:3241
+msgid "No matching user IDs."
+msgstr "No matching user IDs."
+
+#: g10/keyedit.c:3241
+msgid "Nothing to sign.\n"
+msgstr "Nothing to sign.\n"
+
+#: g10/keyedit.c:3414
+msgid "Digest: "
+msgstr "Digest: "
+
+#: g10/keyedit.c:3471
+msgid "Features: "
+msgstr "Features: "
+
+#: g10/keyedit.c:3482
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
+#: g10/keyedit.c:3497 g10/keylist.c:377
+msgid "Preferred keyserver: "
+msgstr "Preferred keyserver: "
+
+#: g10/keyedit.c:3505 g10/keyedit.c:3506
+msgid "Notations: "
+msgstr "Notations: "
+
+#: g10/keyedit.c:3751
+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:3823
+#, 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:3847
+#, 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:3853
+msgid "(sensitive)"
+msgstr "(sensitive)"
+
+#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
+#, c-format
+msgid "created: %s"
+msgstr "created: %s"
+
+#: g10/keyedit.c:3898 g10/keylist.c:1843
+#, c-format
+msgid "revoked: %s"
+msgstr "revoked: %s"
+
+#: g10/keyedit.c:3900 g10/keylist.c:1849
+#, c-format
+msgid "expired: %s"
+msgstr "expired: %s"
+
+#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
+#: g10/keyserver.c:542
+#, c-format
+msgid "expires: %s"
+msgstr "expires: %s"
+
+#: g10/keyedit.c:3904
+#, c-format
+msgid "usage: %s"
+msgstr "usage: %s"
+
+#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
+msgid "card-no: "
+msgstr "card-no: "
+
+#: g10/keyedit.c:3971
+#, c-format
+msgid "trust: %s"
+msgstr "trust: %s"
+
+#: g10/keyedit.c:3975
+#, c-format
+msgid "validity: %s"
+msgstr "validity: %s"
+
+#: g10/keyedit.c:3982
+msgid "This key has been disabled"
+msgstr "This key has been disabled"
+
+#: g10/keyedit.c:4000
+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:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
+msgid "revoked"
+msgstr "revoked"
+
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
+msgid "expired"
+msgstr "expired"
+
+#: g10/keyedit.c:4175
+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:4227
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr "WARNING: Your encryption subkey expires soon.\n"
+
+#: g10/keyedit.c:4228
+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:4287
+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:4292 g10/keyedit.c:4579
+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:4298
+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:4311 g10/keygen.c:2676
+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:4412
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Delete this good signature? (y/N/q)"
+
+#: g10/keyedit.c:4422
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Delete this invalid signature? (y/N/q)"
+
+#: g10/keyedit.c:4426
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Delete this unknown signature? (y/N/q)"
+
+#: g10/keyedit.c:4433
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Really delete this self-signature? (y/N)"
+
+#: g10/keyedit.c:4449
+#, 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:4453
+msgid "Nothing deleted.\n"
+msgstr "Nothing deleted.\n"
+
+#: g10/keyedit.c:4488 g10/trust.c:693
+msgid "invalid"
+msgstr "invalid"
+
+#: g10/keyedit.c:4490
+#, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID “[1m%s[0m” compacted: %s\n"
+
+#: g10/keyedit.c:4496
+#, 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:4504
+#, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID “[1m%s[0m”: already minimized\n"
+
+#: g10/keyedit.c:4505
+#, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User ID “[1m%s[0m”: already clean\n"
+
+#: g10/keyedit.c:4574
+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:4585
+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:4602
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Enter the user ID of the designated revoker: "
+
+#: g10/keyedit.c:4627
+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:4642
+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:4664
+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:4682
+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:4688
+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:4739
+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:4744
+msgid "Changing expiration time for a subkey.\n"
+msgstr "Changing expiration time for a subkey.\n"
+
+#: g10/keyedit.c:4747
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Changing expiration time for the primary key.\n"
+
+#: g10/keyedit.c:4798
+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:4971
+#, c-format
+msgid "signing subkey %s is already cross-certified\n"
+msgstr "signing subkey %s is already cross-certified\n"
+
+#: g10/keyedit.c:4977
+#, 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:5092
+msgid "Please select exactly one user ID.\n"
+msgstr "Please select exactly one user ID.\n"
+
+#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
+#, 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:5304
+msgid "Enter your preferred keyserver URL: "
+msgstr "Enter your preferred keyserver URL: "
+
+#: g10/keyedit.c:5383
+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:5384
+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:5443
+msgid "Enter the notation: "
+msgstr "Enter the notation: "
+
+#: g10/keyedit.c:5590
+msgid "Proceed? (y/N) "
+msgstr "Proceed? (y/N) "
+
+#: g10/keyedit.c:5660
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "No user ID with index %d\n"
+
+#: g10/keyedit.c:5722
+#, c-format
+msgid "No user ID with hash %s\n"
+msgstr "No user ID with hash %s\n"
+
+#: g10/keyedit.c:5823
+#, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "No subkey with key ID '%s'.\n"
+
+#: g10/keyedit.c:5845
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "No subkey with index %d\n"
+
+#: g10/keyedit.c:5986
+#, c-format
+msgid "user ID: \"%s\"\n"
+msgstr "user ID: “[1m%s[0m”\n"
+
+#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#, 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:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
+msgid " (non-exportable)"
+msgstr " (non-exportable)"
+
+#: g10/keyedit.c:5995
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "This signature expired on %s.\n"
+
+#: g10/keyedit.c:6000
+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:6005
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Create a revocation certificate for this signature? (y/N) "
+
+#: g10/keyedit.c:6059
+msgid "Not signed by you.\n"
+msgstr "Not signed by you.\n"
+
+#: g10/keyedit.c:6065
+#, 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:6094
+msgid " (non-revocable)"
+msgstr " (non-revocable)"
+
+#: g10/keyedit.c:6101
+#, c-format
+msgid "revoked by your key %s on %s\n"
+msgstr "revoked by your key %s on %s\n"
+
+#: g10/keyedit.c:6126
+msgid "You are about to revoke these signatures:\n"
+msgstr "You are about to revoke these signatures:\n"
+
+#: g10/keyedit.c:6149
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Really create the revocation certificates? (y/N) "
+
+#: g10/keyedit.c:6182
+msgid "no secret key\n"
+msgstr "no secret key\n"
+
+#: g10/keyedit.c:6230
+#, 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:6240
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "user ID “[1m%s[0m” is already revoked\n"
+
+#: g10/keyedit.c:6257
+#, 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:6370
+#, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Key %s is already revoked.\n"
+
+#: g10/keyedit.c:6432
+#, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Subkey %s is already revoked.\n"
+
+#: g10/keyedit.c:6529
+#, 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:295
+#, c-format
+msgid "preference '%s' duplicated\n"
+msgstr "preference ‘[1m%s[0m’ duplicated\n"
+
+#: g10/keygen.c:302
+msgid "too many cipher preferences\n"
+msgstr "too many cipher preferences\n"
+
+#: g10/keygen.c:304
+msgid "too many digest preferences\n"
+msgstr "too many digest preferences\n"
+
+#: g10/keygen.c:306
+msgid "too many compression preferences\n"
+msgstr "too many compression preferences\n"
+
+#: g10/keygen.c:447
+#, c-format
+msgid "invalid item '%s' in preference string\n"
+msgstr "invalid item ‘[1m%s[0m’ in preference string\n"
+
+#: g10/keygen.c:926
+msgid "writing direct signature\n"
+msgstr "writing direct signature\n"
+
+#: g10/keygen.c:972
+msgid "writing self signature\n"
+msgstr "writing self signature\n"
+
+#: g10/keygen.c:1028
+msgid "writing key binding signature\n"
+msgstr "writing key binding signature\n"
+
+#: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
+#: g10/keygen.c:1600 g10/keygen.c:1605
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "keysize invalid; using %u bits\n"
+
+#: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "keysize rounded up to %u bits\n"
+
+#: g10/keygen.c:1493
+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:1667
+msgid "Sign"
+msgstr "Sign"
+
+#: g10/keygen.c:1670
+msgid "Certify"
+msgstr "Certify"
+
+#: g10/keygen.c:1673
+msgid "Encrypt"
+msgstr "Encrypt"
+
+#: g10/keygen.c:1676
+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:1695
+msgid "SsEeAaQq"
+msgstr "SsEeAaQq"
+
+#: g10/keygen.c:1722
+#, c-format
+msgid "Possible actions for a %s key: "
+msgstr "Possible actions for a %s key: "
+
+#: g10/keygen.c:1728
+msgid "Current allowed actions: "
+msgstr "Current allowed actions: "
+
+#: g10/keygen.c:1733
+#, c-format
+msgid " (%c) Toggle the sign capability\n"
+msgstr " (%c) Toggle the sign capability\n"
+
+#: g10/keygen.c:1736
+#, c-format
+msgid " (%c) Toggle the encrypt capability\n"
+msgstr " (%c) Toggle the encrypt capability\n"
+
+#: g10/keygen.c:1739
+#, c-format
+msgid " (%c) Toggle the authenticate capability\n"
+msgstr " (%c) Toggle the authenticate capability\n"
+
+#: g10/keygen.c:1742
+#, c-format
+msgid " (%c) Finished\n"
+msgstr " (%c) Finished\n"
+
+#: g10/keygen.c:1871 sm/certreqgen-ui.c:161
+msgid "Please select what kind of key you want:\n"
+msgstr "Please select what kind of key you want:\n"
+
+#: g10/keygen.c:1875
+#, c-format
+msgid " (%d) RSA and RSA (default)\n"
+msgstr " (%d) RSA and RSA (default)\n"
+
+#: g10/keygen.c:1879
+#, c-format
+msgid " (%d) DSA and Elgamal\n"
+msgstr " (%d) DSA and Elgamal\n"
+
+#: g10/keygen.c:1881
+#, c-format
+msgid " (%d) DSA (sign only)\n"
+msgstr " (%d) DSA (sign only)\n"
+
+#: g10/keygen.c:1883
+#, c-format
+msgid " (%d) RSA (sign only)\n"
+msgstr " (%d) RSA (sign only)\n"
+
+#: g10/keygen.c:1888
+#, c-format
+msgid " (%d) Elgamal (encrypt only)\n"
+msgstr " (%d) Elgamal (encrypt only)\n"
+
+#: g10/keygen.c:1890
+#, c-format
+msgid " (%d) RSA (encrypt only)\n"
+msgstr " (%d) RSA (encrypt only)\n"
+
+#: g10/keygen.c:1895
+#, c-format
+msgid " (%d) DSA (set your own capabilities)\n"
+msgstr " (%d) DSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1897
+#, c-format
+msgid " (%d) RSA (set your own capabilities)\n"
+msgstr " (%d) RSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1903
+#, c-format
+msgid " (%d) ECC and ECC\n"
+msgstr " (%d) ECC and ECC\n"
+
+#: g10/keygen.c:1905
+#, c-format
+msgid " (%d) ECC (sign only)\n"
+msgstr " (%d) ECC (sign only)\n"
+
+#: g10/keygen.c:1907
+#, c-format
+msgid " (%d) ECC (set your own capabilities)\n"
+msgstr " (%d) ECC (set your own capabilities)\n"
+
+#: g10/keygen.c:1909
+#, c-format
+msgid " (%d) ECC (encrypt only)\n"
+msgstr " (%d) ECC (encrypt only)\n"
+
+#: g10/keygen.c:1913
+#, c-format
+msgid " (%d) Existing key\n"
+msgstr " (%d) Existing key\n"
+
+#: g10/keygen.c:2003 sm/certreqgen-ui.c:206
+msgid "Enter the keygrip: "
+msgstr "Enter the keygrip: "
+
+#: g10/keygen.c:2016 sm/certreqgen-ui.c:214
+msgid "Not a valid keygrip (expecting 40 hex digits)\n"
+msgstr "Not a valid keygrip (expecting 40 hex digits)\n"
+
+#: g10/keygen.c:2018 sm/certreqgen-ui.c:216
+msgid "No key with this keygrip\n"
+msgstr "No key with this keygrip\n"
+
+#: g10/keygen.c:2092 g10/keygen.c:2106
+#, c-format
+msgid "rounded to %u bits\n"
+msgstr "rounded to %u bits\n"
+
+#: g10/keygen.c:2147
+#, 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:2155
+#, 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:2158 sm/certreqgen-ui.c:183
+#, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "What keysize do you want? (%u) "
+
+#: g10/keygen.c:2172 sm/certreqgen-ui.c:193
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Requested keysize is %u bits\n"
+
+#: g10/keygen.c:2217
+msgid "Please select which elliptic curve you want:\n"
+msgstr "Please select which elliptic curve you want:\n"
+
+#: g10/keygen.c:2382
+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:2393
+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:2416
+msgid "Key is valid for? (0) "
+msgstr "Key is valid for? (0) "
+
+#: g10/keygen.c:2421
+#, c-format
+msgid "Signature is valid for? (%s) "
+msgstr "Signature is valid for? (%s) "
+
+#: g10/keygen.c:2440 g10/keygen.c:2465
+msgid "invalid value\n"
+msgstr "invalid value\n"
+
+#: g10/keygen.c:2447
+msgid "Key does not expire at all\n"
+msgstr "Key does not expire at all\n"
+
+#: g10/keygen.c:2448
+msgid "Signature does not expire at all\n"
+msgstr "Signature does not expire at all\n"
+
+#: g10/keygen.c:2453
+#, c-format
+msgid "Key expires at %s\n"
+msgstr "Key expires at %s\n"
+
+#: g10/keygen.c:2454
+#, c-format
+msgid "Signature expires at %s\n"
+msgstr "Signature expires at %s\n"
+
+#: g10/keygen.c:2458
+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:2471
+msgid "Is this correct? (y/N) "
+msgstr "Is this correct? (y/N) "
+
+#: g10/keygen.c:2539
+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:2554
+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:2573
+msgid "Real name: "
+msgstr "Real name: "
+
+#: g10/keygen.c:2582
+msgid "Invalid character in name\n"
+msgstr "Invalid character in name\n"
+
+#: g10/keygen.c:2583
+#, 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:2587
+msgid "Name may not start with a digit\n"
+msgstr "Name may not start with a digit\n"
+
+#: g10/keygen.c:2590
+msgid "Name must be at least 5 characters long\n"
+msgstr "Name must be at least 5 characters long\n"
+
+#: g10/keygen.c:2600
+msgid "Email address: "
+msgstr "Email address: "
+
+#: g10/keygen.c:2606
+msgid "Not a valid email address\n"
+msgstr "Not a valid email address\n"
+
+#: g10/keygen.c:2615
+msgid "Comment: "
+msgstr "Comment: "
+
+#: g10/keygen.c:2621
+msgid "Invalid character in comment\n"
+msgstr "Invalid character in comment\n"
+
+#: g10/keygen.c:2657
+#, 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:2663
+#, 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:2668
+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:2693
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoQq"
+
+#: g10/keygen.c:2703
+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:2704
+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:2709
+msgid "Change (N)ame, (E)mail, or (Q)uit? "
+msgstr "Change (N)ame, (E)mail, or (Q)uit? "
+
+#: g10/keygen.c:2710
+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:2729
+msgid "Please correct the error first\n"
+msgstr "Please correct the error first\n"
+
+#: g10/keygen.c:2775
+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:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
+#: g10/keygen.c:4791
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Key generation failed: %s\n"
+
+#: g10/keygen.c:3577
+#, 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:3579
+msgid "Continue? (Y/n) "
+msgstr "Continue? (Y/n) "
+
+#: g10/keygen.c:3600
+#, c-format
+msgid "A key for \"%s\" already exists\n"
+msgstr "A key for “[1m%s[0m” already exists\n"
+
+#: g10/keygen.c:3605
+msgid "Create anyway? (y/N) "
+msgstr "Create anyway? (y/N) "
+
+#: g10/keygen.c:3610
+msgid "creating anyway\n"
+msgstr "creating anyway\n"
+
+#: g10/keygen.c:3904
+#, 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:3936
+msgid "Key generation canceled.\n"
+msgstr "Key generation canceled.\n"
+
+#: g10/keygen.c:3996
+#, c-format
+msgid "can't create backup file '%s': %s\n"
+msgstr "can't create backup file '%s': %s\n"
+
+#: g10/keygen.c:4016
+#, 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:4167 g10/keygen.c:4315
+#, c-format
+msgid "writing public key to '%s'\n"
+msgstr "writing public key to ‘[1m%s[0m’\n"
+
+#: g10/keygen.c:4309
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "no writable public keyring found: %s\n"
+
+#: g10/keygen.c:4323
+#, c-format
+msgid "error writing public keyring '%s': %s\n"
+msgstr "error writing public keyring '%s': %s\n"
+
+#: g10/keygen.c:4355
+msgid "public and secret key created and signed.\n"
+msgstr "public and secret key created and signed.\n"
+
+#: g10/keygen.c:4367
+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:4567 g10/keygen.c:4741
+#, 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:4569 g10/keygen.c:4743
+#, 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:4580 g10/keygen.c:4754
+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:4592 g10/keygen.c:4594
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Secret parts of primary key are not available.\n"
+
+#: g10/keygen.c:4601 g10/keygen.c:4603
+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:4622 g10/keygen.c:4769
+msgid "Really create? (y/N) "
+msgstr "Really create? (y/N) "
+
+#: g10/keyid.c:662 g10/keyid.c:675 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:375
+msgid "Critical preferred keyserver: "
+msgstr "Critical preferred keyserver: "
+
+#: g10/keylist.c:428
+msgid "Critical signature notation: "
+msgstr "Critical signature notation: "
+
+#: g10/keylist.c:430
+msgid "Signature notation: "
+msgstr "Signature notation: "
+
+#: g10/keylist.c:472
+#, c-format
+msgid "%d good signature\n"
+msgid_plural "%d good signatures\n"
+msgstr[0] "%d good signature\n"
+msgstr[1] "%d good signatures\n"
+
+#: g10/keylist.c:485
+#, c-format
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "%d signature not checked due to an error\n"
+msgstr[1] "%d signatures not checked due to errors\n"
+
+#: g10/keylist.c:567
+#, c-format
+msgid "Warning: %lu key skipped due to its large size\n"
+msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
+msgstr[0] "Warning: %lu key skipped due to its large size\n"
+msgstr[1] "Warning: %lu keys skipped due to their large sizes\n"
+
+#: g10/keylist.c:589
+msgid "Keyring"
+msgstr "Keyring"
+
+#: g10/keylist.c:1710
+msgid "Primary key fingerprint:"
+msgstr "Primary key fingerprint:"
+
+#: g10/keylist.c:1712
+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:1720
+msgid " Primary key fingerprint:"
+msgstr " Primary key fingerprint:"
+
+#: g10/keylist.c:1722 g10/keylist.c:1732
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
+#: g10/keylist.c:1727 g10/keylist.c:1743
+msgid " Key fingerprint ="
+msgstr " Key fingerprint ="
+
+#: g10/keylist.c:1794
+msgid " Card serial no. ="
+msgstr " Card serial no. ="
+
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
+#, c-format
+msgid "caching keyring '%s'\n"
+msgstr "caching keyring ‘[1m%s[0m’\n"
+
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
+#, c-format
+msgid "%lu keys cached so far (%lu signature)\n"
+msgid_plural "%lu keys cached so far (%lu signatures)\n"
+msgstr[0] "%lu keys cached so far (%lu signature)\n"
+msgstr[1] "%lu keys cached so far (%lu signatures)\n"
+
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
+#, c-format
+msgid "%lu key cached"
+msgid_plural "%lu keys cached"
+msgstr[0] "%lu key cached"
+msgstr[1] "%lu keys cached"
+
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
+#, c-format
+msgid " (%lu signature)\n"
+msgid_plural " (%lu signatures)\n"
+msgstr[0] " (%lu signature)\n"
+msgstr[1] " (%lu signatures)\n"
+
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: keyring created\n"
+
+#: g10/keyserver.c:90
+msgid "override proxy options set for dirmngr"
+msgstr "override proxy options set for dirmngr"
+
+#: g10/keyserver.c:92
+msgid "include revoked keys in search results"
+msgstr "include revoked keys in search results"
+
+#: g10/keyserver.c:93
+msgid "include subkeys when searching by key ID"
+msgstr "include subkeys when searching by key ID"
+
+#: g10/keyserver.c:95
+msgid "override timeout options set for dirmngr"
+msgstr "override timeout options set for dirmngr"
+
+#: g10/keyserver.c:99
+msgid "automatically retrieve keys when verifying signatures"
+msgstr "automatically retrieve keys when verifying signatures"
+
+#: g10/keyserver.c:101
+msgid "honor the preferred keyserver URL set on the key"
+msgstr "honor the preferred keyserver URL set on the key"
+
+#: g10/keyserver.c:103
+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:548
+msgid "disabled"
+msgstr "disabled"
+
+#: g10/keyserver.c:752
+msgid "Enter number(s), N)ext, or Q)uit > "
+msgstr "Enter number(s), N)ext, or Q)uit > "
+
+#: g10/keyserver.c:858
+#, c-format
+msgid "invalid keyserver protocol (us %d!=handler %d)\n"
+msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
+
+#: g10/keyserver.c:999 g10/keyserver.c:1114
+#, c-format
+msgid "\"%s\" not a key ID: skipping\n"
+msgstr "“[1m%s[0m” not a key ID: skipping\n"
+
+#: g10/keyserver.c:1419 g10/keyserver.c:1452
+#, 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:1426
+#, 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:1530
+#, c-format
+msgid "key \"%s\" not found on keyserver\n"
+msgstr "key “[1m%s[0m” not found on keyserver\n"
+
+#: g10/keyserver.c:1533
+msgid "key not found on keyserver\n"
+msgstr "key not found on keyserver\n"
+
+#: g10/keyserver.c:1537
+msgid "no keyserver known (use option --keyserver)\n"
+msgstr "no keyserver known (use option --keyserver)\n"
+
+#: g10/keyserver.c:1701
+#, c-format
+msgid "requesting key %s from %s server %s\n"
+msgstr "requesting key %s from %s server %s\n"
+
+#: g10/keyserver.c:1705
+#, c-format
+msgid "requesting key %s from %s\n"
+msgstr "requesting key %s from %s\n"
+
+#: g10/keyserver.c:1805 g10/keyserver.c:1960
+msgid "no keyserver known\n"
+msgstr "no keyserver known\n"
+
+#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+#, c-format
+msgid "skipped \"%s\": %s\n"
+msgstr "skipped “[1m%s[0m”: %s\n"
+
+#: g10/keyserver.c:1823
+#, c-format
+msgid "sending key %s to %s\n"
+msgstr "sending key %s to %s\n"
+
+#: g10/keyserver.c:1864
+#, c-format
+msgid "requesting key from '%s'\n"
+msgstr "requesting key from ‘[1m%s[0m’\n"
+
+#: g10/keyserver.c:1880
+#, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "WARNING: unable to fetch URI %s: %s\n"
+
+#: g10/mainproc.c:254
+#, c-format
+msgid "weird size for an encrypted session key (%d)\n"
+msgstr "weird size for an encrypted session key (%d)\n"
+
+#: g10/mainproc.c:302
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s encrypted session key\n"
+
+#: g10/mainproc.c:312
+#, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "passphrase generated with unknown digest algorithm %d\n"
+
+#: g10/mainproc.c:378
+#, c-format
+msgid "public key is %s\n"
+msgstr "public key is %s\n"
+
+#: g10/mainproc.c:456
+msgid "public key encrypted data: good DEK\n"
+msgstr "public key encrypted data: good DEK\n"
+
+#: g10/mainproc.c:489
+#, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+msgstr "encrypted with %u-bit %s key, ID %s, created %s\n"
+
+#: g10/mainproc.c:493 g10/pkclist.c:228
+#, c-format
+msgid " \"%s\"\n"
+msgstr " “[1m%s[0m”\n"
+
+#: g10/mainproc.c:497
+#, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "encrypted with %s key, ID %s\n"
+
+#: g10/mainproc.c:514
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "public key decryption failed: %s\n"
+
+#: g10/mainproc.c:530
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "encrypted with %lu passphrases\n"
+
+#: g10/mainproc.c:532
+msgid "encrypted with 1 passphrase\n"
+msgstr "encrypted with 1 passphrase\n"
+
+#: g10/mainproc.c:566 g10/mainproc.c:587
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "assuming %s encrypted data\n"
+
+#: g10/mainproc.c:573
+#, c-format
+msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
+msgstr "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
+
+#: g10/mainproc.c:618 g10/mainproc.c:632
+msgid "WARNING: message was not integrity protected\n"
+msgstr "WARNING: message was not integrity protected\n"
+
+#: g10/mainproc.c:628
+msgid "decryption okay\n"
+msgstr "decryption okay\n"
+
+#: g10/mainproc.c:637
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "WARNING: encrypted message has been manipulated!\n"
+
+#: g10/mainproc.c:653
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "decryption failed: %s\n"
+
+#: g10/mainproc.c:676
+msgid "Note: sender requested \"for-your-eyes-only\"\n"
+msgstr "Note: sender requested “[1mfor-your-eyes-only[0m”\n"
+
+#: g10/mainproc.c:678
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "original file name='%.*s'\n"
+
+#: g10/mainproc.c:748
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr "WARNING: multiple plaintexts seen\n"
+
+#: g10/mainproc.c:914
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr "standalone revocation - use “[1mgpg --import[0m” to apply\n"
+
+#: g10/mainproc.c:1214 g10/mainproc.c:1257
+msgid "no signature found\n"
+msgstr "no signature found\n"
+
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "BAD signature from “[1m%s[0m”"
+
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Expired signature from “[1m%s[0m”"
+
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Good signature from “[1m%s[0m”"
+
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
+msgid "signature verification suppressed\n"
+msgstr "signature verification suppressed\n"
+
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
+msgid "can't handle this ambiguous signature data\n"
+msgstr "can't handle this ambiguous signature data\n"
+
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
+#, c-format
+msgid "Signature made %s\n"
+msgstr "Signature made %s\n"
+
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
+#, c-format
+msgid " using %s key %s\n"
+msgstr " using %s key %s\n"
+
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
+#, 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:1744
++#: g10/mainproc.c:1755
++#, c-format
++msgid " issuer \"%s\"\n"
++msgstr " issuer “[1m%s[0m”\n"
++
++#: g10/mainproc.c:1772
+msgid "Key available at: "
+msgstr "Key available at: "
+
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
+msgid "[uncertain]"
+msgstr "[uncertain]"
+
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
+#, c-format
+msgid " aka \"%s\""
+msgstr " aka “[1m%s[0m”"
+
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Signature expired %s\n"
+
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Signature expires %s\n"
+
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
+#, c-format
+msgid "%s signature, digest algorithm %s%s%s\n"
+msgstr "%s signature, digest algorithm %s%s%s\n"
+
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
+msgid "binary"
+msgstr "binary"
+
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
+msgid "textmode"
+msgstr "textmode"
+
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
+msgid "unknown"
+msgstr "unknown"
+
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
+msgid ", key algorithm "
+msgstr ", key algorithm "
+
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
+#, 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:2189
++#: g10/mainproc.c:2217
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Can't check signature: %s\n"
+
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
+msgid "not a detached signature\n"
+msgstr "not a detached signature\n"
+
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
+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:2339
++#: g10/mainproc.c:2367
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "standalone signature of class 0x%02x\n"
+
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
+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:1056
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: deprecated option “[1m%s[0m”\n"
+
+#: g10/misc.c:1060
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNING: “[1m%s[0m” is a deprecated option\n"
+
+#: g10/misc.c:1062
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "please use “[1m%s%s[0m” instead\n"
+
+#: g10/misc.c:1069
+#, 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:1079
+#, 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:1083
+#, 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:1147
+msgid "Uncompressed"
+msgstr "Uncompressed"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:1172
+msgid "uncompressed|none"
+msgstr "uncompressed|none"
+
+#: g10/misc.c:1292
+#, 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:1467
+#, c-format
+msgid "ambiguous option '%s'\n"
+msgstr "ambiguous option ‘[1m%s[0m’\n"
+
+#: g10/misc.c:1492
+#, c-format
+msgid "unknown option '%s'\n"
+msgstr "unknown option ‘[1m%s[0m’\n"
+
+#: g10/misc.c:1730
+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:1752
+#, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "unknown weak digest ‘[1m%s[0m’\n"
+
+#: g10/openfile.c:84
+#, c-format
+msgid "File '%s' exists. "
+msgstr "File ‘[1m%s[0m’ exists. "
+
+#: g10/openfile.c:88
+msgid "Overwrite? (y/N) "
+msgstr "Overwrite? (y/N) "
+
+#: g10/openfile.c:123
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: unknown suffix\n"
+
+#: g10/openfile.c:147
+msgid "Enter new filename"
+msgstr "Enter new filename"
+
+#: g10/openfile.c:218
+msgid "writing to stdout\n"
+msgstr "writing to stdout\n"
+
+#: g10/openfile.c:366
+#, c-format
+msgid "assuming signed data in '%s'\n"
+msgstr "assuming signed data in ‘[1m%s[0m’\n"
+
+#: g10/openfile.c:457
+#, c-format
+msgid "new configuration file '%s' created\n"
+msgstr "new configuration file ‘[1m%s[0m’ created\n"
+
+#: g10/openfile.c:498
+#, c-format
+msgid "WARNING: options in '%s' are not yet active during this run\n"
+msgstr "WARNING: options in ‘[1m%s[0m’ are not yet active during this run\n"
+
+#: g10/parse-packet.c:257
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "can't handle public key algorithm %d\n"
+
+#: g10/parse-packet.c:1113
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
+
+#: g10/parse-packet.c:1649
+#, c-format
+msgid "subpacket of type %d has critical bit set\n"
+msgstr "subpacket of type %d has critical bit set\n"
+
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
+#, c-format
+msgid "problem with the agent: %s\n"
+msgstr "problem with the agent: %s\n"
+
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, c-format
- msgid " (main key ID %s)"
- msgstr " (main key ID %s)"
-
- #: g10/passphrase.c:277
- #, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "“[1m%.*s[0m”\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
+msgid "Enter passphrase\n"
+msgstr "Enter passphrase\n"
+
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
+msgid "cancelled by user\n"
+msgstr "cancelled by user\n"
+
- #: g10/passphrase.c:483
- #, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "You need a passphrase to unlock the secret key for\n"
- "user: “[1m%s[0m”\n"
-
- #: g10/passphrase.c:491
- #, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%u-bit %s key, ID %s, created %s"
-
- #: g10/passphrase.c:500
++#: g10/passphrase.c:489
+#, c-format
- msgid " (subkey on main key ID %s)"
- msgstr " (subkey on main key ID %s)"
++msgid " (main key ID %s)"
++msgstr " (main key ID %s)"
+
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
+msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
+msgstr "Please enter the passphrase to unlock the OpenPGP secret key:"
+
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
+msgid "Please enter the passphrase to import the OpenPGP secret key:"
+msgstr "Please enter the passphrase to import the OpenPGP secret key:"
+
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
+msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
+msgstr "Please enter the passphrase to export the OpenPGP secret subkey:"
+
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
+msgid "Please enter the passphrase to export the OpenPGP secret key:"
+msgstr "Please enter the passphrase to export the OpenPGP secret key:"
+
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
+msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
+msgstr ""
+"Do you really want to permanently delete the OpenPGP secret subkey key:"
+
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
+msgid "Do you really want to permanently delete the OpenPGP secret key:"
+msgstr "Do you really want to permanently delete the OpenPGP secret key:"
+
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
+#, c-format
+msgid ""
+"%s\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %s,\n"
+"created %s%s.\n"
+"%s"
+msgstr ""
+"%s\n"
+"“[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:757
+msgid "No reason specified"
+msgstr "No reason specified"
+
+#: g10/pkclist.c:74 g10/revoke.c:759
+msgid "Key is superseded"
+msgstr "Key is superseded"
+
+#: g10/pkclist.c:76 g10/revoke.c:758
+msgid "Key has been compromised"
+msgstr "Key has been compromised"
+
+#: g10/pkclist.c:78 g10/revoke.c:760
+msgid "Key is no longer used"
+msgstr "Key is no longer used"
+
+#: g10/pkclist.c:80 g10/revoke.c:761
+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:786
+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:476
+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:495
+msgid "Use this key anyway? (y/N) "
+msgstr "Use this key anyway? (y/N) "
+
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
+msgid "WARNING: Using untrusted key!\n"
+msgstr "WARNING: Using untrusted key!\n"
+
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
+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:561
++#: g10/pkclist.c:565
+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:564
++#: g10/pkclist.c:568
+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:565
++#: g10/pkclist.c:569
+msgid " This could mean that the signature is forged.\n"
+msgstr " This could mean that the signature is forged.\n"
+
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
+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:576
++#: g10/pkclist.c:580
+msgid "Note: This key has been disabled.\n"
+msgstr "Note: This key has been disabled.\n"
+
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
+#, 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:603
++#: g10/pkclist.c:607
+#, 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:615
++#: g10/pkclist.c:619
+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:623
++#: g10/pkclist.c:627
+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:634
++#: g10/pkclist.c:638
+msgid "Note: This key has expired!\n"
+msgstr "Note: This key has expired!\n"
+
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
+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:647
++#: g10/pkclist.c:651
+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:655
++#: g10/pkclist.c:659
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "WARNING: We do NOT trust this key!\n"
+
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
+msgid " The signature is probably a FORGERY.\n"
+msgstr " The signature is probably a FORGERY.\n"
+
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
+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:666
++#: g10/pkclist.c:670
+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:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: skipped: %s\n"
+
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: skipped: public key is disabled\n"
+
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: skipped: public key already present\n"
+
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
+#, c-format
+msgid "can't encrypt to '%s'\n"
+msgstr "can't encrypt to ‘[1m%s[0m’\n"
+
- #: g10/pkclist.c:984
++#: g10/pkclist.c:988
+#, 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:991
++#: g10/pkclist.c:995
+#, 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:1094
++#: g10/pkclist.c:1098
+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:1118
++#: g10/pkclist.c:1122
+msgid "Current recipients:\n"
+msgstr "Current recipients:\n"
+
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
+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:1168
++#: g10/pkclist.c:1172
+msgid "No such user ID.\n"
+msgstr "No such user ID.\n"
+
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
+msgid "skipped: public key already set as default recipient\n"
+msgstr "skipped: public key already set as default recipient\n"
+
- #: g10/pkclist.c:1200
++#: g10/pkclist.c:1204
+msgid "Public key is disabled.\n"
+msgstr "Public key is disabled.\n"
+
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
+msgid "skipped: public key already set\n"
+msgstr "skipped: public key already set\n"
+
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
+#, c-format
+msgid "unknown default recipient \"%s\"\n"
+msgstr "unknown default recipient “[1m%s[0m”\n"
+
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
+msgid "no valid addressees\n"
+msgstr "no valid addressees\n"
+
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
+#, c-format
+msgid "Note: key %s has no %s feature\n"
+msgstr "Note: key %s has no %s feature\n"
+
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
+#, 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:598
+msgid "Detached signature.\n"
+msgstr "Detached signature.\n"
+
+#: g10/plaintext.c:606
+msgid "Please enter name of data file: "
+msgstr "Please enter name of data file: "
+
+#: g10/plaintext.c:643
+msgid "reading stdin ...\n"
+msgstr "reading stdin ...\n"
+
+#: g10/plaintext.c:688
+msgid "no signed data\n"
+msgstr "no signed data\n"
+
+#: g10/plaintext.c:706
+#, c-format
+msgid "can't open signed data '%s'\n"
+msgstr "can't open signed data ‘[1m%s[0m’\n"
+
+#: g10/plaintext.c:741
+#, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "can't open signed data fd=%d: %s\n"
+
+#: g10/pubkey-enc.c:116
+#, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonymous recipient; trying secret key %s ...\n"
+
+#: g10/pubkey-enc.c:123
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "okay, we are the anonymous recipient.\n"
+
+#: g10/pubkey-enc.c:282
+msgid "old encoding of the DEK is not supported\n"
+msgstr "old encoding of the DEK is not supported\n"
+
+#: g10/pubkey-enc.c:310
+#, c-format
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr "cipher algorithm %d%s is unknown or disabled\n"
+
+#: g10/pubkey-enc.c:352
+#, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
+msgstr "WARNING: cipher algorithm %s not found in recipient preferences\n"
+
+#: g10/pubkey-enc.c:377
+#, c-format
+msgid "Note: secret key %s expired at %s\n"
+msgstr "Note: secret key %s expired at %s\n"
+
+#: g10/pubkey-enc.c:384
+msgid "Note: key has been revoked"
+msgstr "Note: key has been revoked"
+
+#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
+#: g10/revoke.c:500
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet failed: %s\n"
+
+#: g10/revoke.c:144
+#, c-format
+msgid "key %s has no user IDs\n"
+msgstr "key %s has no user IDs\n"
+
+#: g10/revoke.c:312
+msgid "To be revoked by:\n"
+msgstr "To be revoked by:\n"
+
+#: g10/revoke.c:316
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(This is a sensitive revocation key)\n"
+
+#: g10/revoke.c:322
+msgid "Secret key is not available.\n"
+msgstr "Secret key is not available.\n"
+
+#: g10/revoke.c:327
+msgid "Create a designated revocation certificate for this key? (y/N) "
+msgstr "Create a designated revocation certificate for this key? (y/N) "
+
+#: g10/revoke.c:336 g10/revoke.c:727
+msgid "ASCII armored output forced.\n"
+msgstr "ASCII armored output forced.\n"
+
+#: g10/revoke.c:352 g10/revoke.c:479
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet failed: %s\n"
+
+#: g10/revoke.c:415
+msgid "Revocation certificate created.\n"
+msgstr "Revocation certificate created.\n"
+
+#: g10/revoke.c:421
+#, c-format
+msgid "no revocation keys found for \"%s\"\n"
+msgstr "no revocation keys found for “[1m%s[0m”\n"
+
+#: g10/revoke.c:551
+msgid "This is a revocation certificate for the OpenPGP key:"
+msgstr "This is a revocation certificate for the OpenPGP key:"
+
+#: g10/revoke.c:567
+msgid ""
+"A revocation certificate is a kind of \"kill switch\" to publicly\n"
+"declare that a key shall not anymore be used. It is not possible\n"
+"to retract such a revocation certificate once it has been published."
+msgstr ""
+"A revocation certificate is a kind of “[1mkill switch[0m” to publicly\n"
+"declare that a key shall not anymore be used. It is not possible\n"
+"to retract such a revocation certificate once it has been published."
+
+#: g10/revoke.c:570
+msgid ""
+"Use it to revoke this key in case of a compromise or loss of\n"
+"the secret key. However, if the secret key is still accessible,\n"
+"it is better to generate a new revocation certificate and give\n"
+"a reason for the revocation. For details see the description of\n"
+"of the gpg command \"--gen-revoke\" 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--gen-revoke[0m” in the GnuPG manual."
+
+#: g10/revoke.c:575
+msgid ""
+"To avoid an accidental use of this file, a colon has been inserted\n"
+"before the 5 dashes below. Remove this colon with a text editor\n"
+"before importing and publishing this revocation certificate."
+msgstr ""
+"To avoid an accidental use of this file, a colon has been inserted\n"
+"before the 5 dashes below. Remove this colon with a text editor\n"
+"before importing and publishing this revocation certificate."
+
+#: g10/revoke.c:590
+#, c-format
+msgid "revocation certificate stored as '%s.rev'\n"
+msgstr "revocation certificate stored as ‘[1m%s.rev[0m’\n"
+
+#: g10/revoke.c:634
+#, 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:661
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr "‘[1m%s[0m’ matches multiple secret keys:\n"
+
+#: g10/revoke.c:688
+#, c-format
+msgid "error searching the keyring: %s\n"
+msgstr "error searching the keyring: %s\n"
+
+#: g10/revoke.c:711
+msgid "Create a revocation certificate for this key? (y/N) "
+msgstr "Create a revocation certificate for this key? (y/N) "
+
+#: g10/revoke.c:735
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable. But have some caution: The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable. But have some caution: The print system of\n"
+"your machine might store the data and make it available to others!\n"
+
+#: g10/revoke.c:769
+msgid "Please select the reason for the revocation:\n"
+msgstr "Please select the reason for the revocation:\n"
+
+#: g10/revoke.c:779
+msgid "Cancel"
+msgstr "Cancel"
+
+#: g10/revoke.c:781
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Probably you want to select %d here)\n"
+
+#: g10/revoke.c:822
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Enter an optional description; end it with an empty line:\n"
+
+#: g10/revoke.c:850
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Reason for revocation: %s\n"
+
+#: g10/revoke.c:852
+msgid "(No description given)\n"
+msgstr "(No description given)\n"
+
+#: g10/revoke.c:857
+msgid "Is this okay? (y/N) "
+msgstr "Is this okay? (y/N) "
+
+#: g10/seskey.c:62 sm/encrypt.c:123
+msgid "weak key created - retrying\n"
+msgstr "weak key created - retrying\n"
+
+#: g10/seskey.c:66
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+msgstr "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+
+#: g10/seskey.c:306
+#, c-format
+msgid "%s key %s uses an unsafe (%zu bit) hash\n"
+msgstr "%s key %s uses an unsafe (%zu bit) hash\n"
+
+#: g10/seskey.c:324
+#, c-format
+msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
+msgstr "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
+
+#: g10/sig-check.c:116
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "WARNING: signature digest conflict in message\n"
+
+#: g10/sig-check.c:143
+#, 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:145
+#, c-format
+msgid "please see %s for more information\n"
+msgstr "please see %s for more information\n"
+
+#: g10/sig-check.c:155
+#, 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:277
+#, 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:286
+#, 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:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
+#, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgid_plural ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr[0] ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr[1] ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+
+#: g10/sig-check.c:309
+#, 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:326
+#, c-format
+msgid "Note: signature key %s expired %s\n"
+msgstr "Note: signature key %s expired %s\n"
+
+#: g10/sig-check.c:337
+#, c-format
+msgid "Note: signature key %s has been revoked\n"
+msgstr "Note: signature key %s has been revoked\n"
+
+#: g10/sig-check.c:471
+#, 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:1048
+#, 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:1051
+#, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "key %s: no subkey for subkey binding signature\n"
+
+#: g10/sign.c:88
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+
+#: g10/sign.c:114
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
+
+#: g10/sign.c:137
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
+"unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
+"unexpanded.\n"
+
- #: g10/sign.c:314
++#: g10/sign.c:329
+#, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s/%s signature from: “[1m%s[0m”\n"
+
- #: g10/sign.c:863
++#: g10/sign.c:878
+#, 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:994
++#: g10/sign.c:1009
+msgid "signing:"
+msgstr "signing:"
+
- #: g10/sign.c:1271
++#: g10/sign.c:1286
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s encryption will be used\n"
+
+#: g10/skclist.c:155 g10/skclist.c:236
+msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+msgstr "key is not flagged as insecure - can't use it with the faked RNG!\n"
+
+#: g10/skclist.c:187
+#, c-format
+msgid "skipped \"%s\": duplicated\n"
+msgstr "skipped “[1m%s[0m”: duplicated\n"
+
+#: g10/skclist.c:206
+msgid "skipped: secret key already present\n"
+msgstr "skipped: secret key already present\n"
+
+#: g10/skclist.c:225
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
+msgstr ""
+"this is a PGP generated Elgamal key which is not secure for signatures!"
+
+#: g10/tdbdump.c:57 g10/trustdb.c:361
+#, 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:217
+#, c-format
+msgid "error finding trust record in '%s': %s\n"
+msgstr "error finding trust record in '%s': %s\n"
+
+#: g10/tdbdump.c:221
+#, c-format
+msgid "read error in '%s': %s\n"
+msgstr "read error in '%s': %s\n"
+
+#: g10/tdbdump.c:230 g10/trustdb.c:376
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "trustdb: sync failed: %s\n"
+
+#: g10/tdbio.c:141 sm/keydb.c:355
+#, 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:1787
+#, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr "trustdb rec %lu: lseek failed: %s\n"
+
+#: g10/tdbio.c:213 g10/tdbio.c:1798
+#, c-format
+msgid "trustdb rec %lu: write failed (n=%d): %s\n"
+msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
+
+#: g10/tdbio.c:352
+msgid "trustdb transaction too large\n"
+msgstr "trustdb transaction too large\n"
+
+#: g10/tdbio.c:682
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: directory does not exist!\n"
+
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
+#, c-format
+msgid "can't access '%s': %s\n"
+msgstr "can't access '%s': %s\n"
+
+#: g10/tdbio.c:724
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: failed to create version record: %s"
+
+#: g10/tdbio.c:729
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: invalid trustdb created\n"
+
+#: g10/tdbio.c:732
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: trustdb created\n"
+
+#: g10/tdbio.c:788
+msgid "Note: trustdb not writable\n"
+msgstr "Note: trustdb not writable\n"
+
+#: g10/tdbio.c:797
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: invalid trustdb\n"
+
+#: g10/tdbio.c:834
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: failed to create hashtable: %s\n"
+
+#: g10/tdbio.c:842
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: error updating version record: %s\n"
+
+#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
+#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: error reading version record: %s\n"
+
+#: g10/tdbio.c:938
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: error writing version record: %s\n"
+
+#: g10/tdbio.c:1461
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "trustdb: lseek failed: %s\n"
+
+#: g10/tdbio.c:1472
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "trustdb: read failed (n=%d): %s\n"
+
+#: g10/tdbio.c:1497
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: not a trustdb file\n"
+
+#: g10/tdbio.c:1522
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: version record with recnum %lu\n"
+
+#: g10/tdbio.c:1528
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: invalid file version %d\n"
+
+#: g10/tdbio.c:1748
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: error reading free record: %s\n"
+
+#: g10/tdbio.c:1757
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: error writing dir record: %s\n"
+
+#: g10/tdbio.c:1768
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: failed to zero a record: %s\n"
+
+#: g10/tdbio.c:1804
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: failed to append a record: %s\n"
+
+#: g10/tdbio.c:1865
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "Error: The trustdb is corrupted.\n"
+
+#: g10/textfilter.c:146
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "can't handle text lines longer than %d characters\n"
+
+#: g10/textfilter.c:241
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "input line longer than %d characters\n"
+
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
+#, c-format
+msgid "error beginning transaction on TOFU database: %s\n"
+msgstr "error beginning transaction on TOFU database: %s\n"
+
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
+#, c-format
+msgid "error committing transaction on TOFU database: %s\n"
+msgstr "error committing transaction on TOFU database: %s\n"
+
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
+#, 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:512
++#: g10/tofu.c:435
+#, c-format
+msgid "unsupported TOFU database version: %s\n"
+msgstr "unsupported TOFU database version: %s\n"
+
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
+#, c-format
+msgid "error reading TOFU database: %s\n"
+msgstr "error reading TOFU database: %s\n"
+
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
+#, c-format
+msgid "error determining TOFU database's version: %s\n"
+msgstr "error determining TOFU database's version: %s\n"
+
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
+#, c-format
+msgid "error initializing TOFU database: %s\n"
+msgstr "error initializing TOFU database: %s\n"
+
- #: g10/tofu.c:761
++#: g10/tofu.c:658
+#, c-format
+msgid "error opening TOFU database '%s': %s\n"
+msgstr "error opening TOFU database '%s': %s\n"
+
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr "Warning: Home directory contains both tofu.db and tofu.d.\n"
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr "Using split format for TOFU database\n"
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
+#, c-format
+msgid "error updating TOFU database: %s\n"
+msgstr "error updating TOFU database: %s\n"
+
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
+#, c-format
+msgid "The binding %s is NOT known."
+msgstr "The binding %s is NOT known."
+
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
+#, c-format
+msgid ""
+"The key with fingerprint %s raised a conflict with the binding %s. Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
+msgstr ""
+"The key with fingerprint %s raised a conflict with the binding %s. Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
+
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
+#, c-format
+msgid ""
+"Please indicate whether you believe the binding %s%sis legitimate (the key "
+"belongs to the stated owner) or a forgery (bad)."
+msgstr ""
+"Please indicate whether you believe the binding %s%sis legitimate (the key "
+"belongs to the stated owner) or a forgery (bad)."
+
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
+#, c-format
+msgid "error gathering other user IDs: %s\n"
+msgstr "error gathering other user IDs: %s\n"
+
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
+msgid "Known user IDs associated with this key:\n"
+msgstr "Known user IDs associated with this key:\n"
+
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
+#, c-format
+msgid "policy: %s"
+msgstr "policy: %s"
+
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
+#, c-format
+msgid "error gathering signature stats: %s\n"
+msgstr "error gathering signature stats: %s\n"
+
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
+#, 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:1845
++#: g10/tofu.c:1318
+#, 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:1859
++#: g10/tofu.c:1332
+msgid "this key"
+msgstr "this key"
+
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
+#, c-format
+msgid "%ld message signed in the future."
+msgid_plural "%ld messages signed in the future."
+msgstr[0] "%ld message signed in the future."
+msgstr[1] "%ld messages signed in the future."
+
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
+#, c-format
+msgid "%ld message signed"
+msgid_plural "%ld messages signed"
+msgstr[0] "%ld message signed"
+msgstr[1] "%ld messages signed"
+
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
+#, c-format
+msgid " over the past %ld day."
+msgid_plural " over the past %ld days."
+msgstr[0] " over the past %ld day."
+msgstr[1] " over the past %ld days."
+
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
+#, c-format
+msgid " over the past %ld week."
+msgid_plural " over the past %ld weeks."
+msgstr[0] " over the past %ld week."
+msgstr[1] " over the past %ld weeks."
+
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
+#, c-format
+msgid " over the past %ld month."
+msgid_plural " over the past %ld months."
+msgstr[0] " over the past %ld month."
+msgstr[1] " over the past %ld months."
+
+#. 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:1909
++#: g10/tofu.c:1382
+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:1947
++#: g10/tofu.c:1420
+msgid "gGaAuUrRbB"
+msgstr "gGaAuUrRbB"
+
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
+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:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
+#, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "error setting TOFU binding's trust level to %s\n"
+
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
+#, c-format
+msgid "error changing TOFU policy: %s\n"
+msgstr "error changing TOFU policy: %s\n"
+
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
+#, c-format
+msgid "%d~year"
+msgid_plural "%d~years"
+msgstr[0] "%d~year"
+msgstr[1] "%d~years"
+
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
+#, c-format
+msgid "%d~month"
+msgid_plural "%d~months"
+msgstr[0] "%d~month"
+msgstr[1] "%d~months"
+
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
+#, c-format
+msgid "%d~day"
+msgid_plural "%d~days"
+msgstr[0] "%d~day"
+msgstr[1] "%d~days"
+
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
+#, c-format
+msgid "%d~hour"
+msgid_plural "%d~hours"
+msgstr[0] "%d~hour"
+msgstr[1] "%d~hours"
+
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
+#, c-format
+msgid "%d~minute"
+msgid_plural "%d~minutes"
+msgstr[0] "%d~minute"
+msgstr[1] "%d~minutes"
+
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
+#, c-format
+msgid "%d~second"
+msgid_plural "%d~seconds"
+msgstr[0] "%d~second"
+msgstr[1] "%d~seconds"
+
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
+#, c-format
+msgid "Have never verified a message signed by key %s!\n"
+msgstr "Have never verified a message signed by key %s!\n"
+
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
+#, c-format
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
+msgstr ""
+"Failed to collect signature statistics for “[1m%s[0m”\n"
+"(key %s)\n"
+
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
+#, c-format
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "Verified %ld messages signed by “[1m%s[0m”."
+
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
+#, c-format
+msgid ""
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
+msgid_plural ""
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
+msgstr[0] ""
+"Verified %ld message signed by “[1m%s[0m”\n"
+"in the past %s."
+msgstr[1] ""
+"Verified %ld messages signed by “[1m%s[0m”\n"
+"in the past %s."
+
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
+#, c-format
+msgid "The most recent message was verified %s ago."
+msgstr "The most recent message was verified %s ago."
+
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
+msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgstr "Warning: we've have yet to see a message signed by this key!\n"
+
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
+msgid "Warning: we've only seen a single message signed by this key!\n"
+msgstr "Warning: we've only seen a single message signed by this key!\n"
+
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
+#, c-format
+msgid ""
+"Warning: if you think you've seen more than %ld message signed by this key, "
+"then this key might be a forgery! Carefully examine the email address for "
+"small variations. If the key is suspect, then use\n"
+" %s\n"
+"to mark it as being bad.\n"
+msgid_plural ""
+"Warning: if you think you've seen more than %ld messages signed by this key, "
+"then this key might be a forgery! Carefully examine the email address for "
+"small variations. If the key is suspect, then use\n"
+" %s\n"
+"to mark it as being bad.\n"
+msgstr[0] ""
+"Warning: if you think you've seen more than %ld message signed by this key, "
+"then this key might be a forgery! Carefully examine the email address for "
+"small variations. If the key is suspect, then use\n"
+" %s\n"
+"to mark it as being bad.\n"
+msgstr[1] ""
+"Warning: if you think you've seen more than %ld messages signed by this key, "
+"then this key might be a forgery! Carefully examine the email address for "
+"small variations. If the key is suspect, then use\n"
+" %s\n"
+"to mark it as being bad.\n"
+
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
+#, c-format
+msgid "error opening TOFU database: %s\n"
+msgstr "error opening TOFU database: %s\n"
+
+#: g10/trustdb.c:215
+#, 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:241
+#, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "key %s: accepted as trusted key\n"
+
+#: g10/trustdb.c:279
+#, 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:294
+#, 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:304
+#, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "key %s marked as ultimately trusted\n"
+
+#: g10/trustdb.c:340
+#, 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:346
+#, 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:421
+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:430
+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:467
+#, 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:473
+#, c-format
+msgid "using %s trust model\n"
+msgstr "using %s trust model\n"
+
+#: g10/trustdb.c:510
+msgid "no need for a trustdb check\n"
+msgstr "no need for a trustdb check\n"
+
+#: g10/trustdb.c:516 g10/trustdb.c:2130
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "next trustdb check due at %s\n"
+
+#: g10/trustdb.c:525
+#, 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:541
+#, 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:748 g10/trustdb.c:1283
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "public key %s not found: %s\n"
+
+#: g10/trustdb.c:965
+msgid "please do a --check-trustdb\n"
+msgstr "please do a --check-trustdb\n"
+
+#: g10/trustdb.c:970
+msgid "checking the trustdb\n"
+msgstr "checking the trustdb\n"
+
+#: g10/trustdb.c:1853
+#, c-format
+msgid "%d key processed"
+msgid_plural "%d keys processed"
+msgstr[0] "%d key processed"
+msgstr[1] "%d keys processed"
+
+#: g10/trustdb.c:1856
+#, 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:1926
+msgid "no ultimately trusted keys found\n"
+msgstr "no ultimately trusted keys found\n"
+
+#: g10/trustdb.c:1940
+#, 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:2057
+#, 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:2137
+#, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "unable to update trustdb version record: write failed: %s\n"
+
+#: g10/trust.c:105
+msgid "undefined"
+msgstr "undefined"
+
+#: g10/trust.c:106
+msgid "never"
+msgstr "never"
+
+#: g10/trust.c:107
+msgid "marginal"
+msgstr "marginal"
+
+#: g10/trust.c:108
+msgid "full"
+msgstr "full"
+
+#: g10/trust.c:109
+msgid "ultimate"
+msgstr "ultimate"
+
+#. TRANSLATORS: these strings are similar to those in
+#. trust_value_to_string(), but are a fixed length. This is needed to
+#. make attractive information listings where columns line up
+#. properly. The value "10" should be the length of the strings you
+#. choose to translate to. This is the length in printable columns.
+#. It gets passed to atoi() so everything after the number is
+#. essentially a comment and need not be translated. Either key and
+#. uid are both NULL, or neither are NULL.
+#: g10/trust.c:146
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr "10 translator see trust.c:uid_trust_string_fixed"
+
+#: g10/trust.c:149
+msgid "[ revoked]"
+msgstr "[ revoked]"
+
+#: g10/trust.c:151 g10/trust.c:157
+msgid "[ expired]"
+msgstr "[ expired]"
+
+#: g10/trust.c:156
+msgid "[ unknown]"
+msgstr "[ unknown]"
+
+#: g10/trust.c:158
+msgid "[ undef ]"
+msgstr "[ undef ]"
+
+#: g10/trust.c:159
+msgid "[ never ]"
+msgstr "[ never ]"
+
+#: g10/trust.c:160
+msgid "[marginal]"
+msgstr "[marginal]"
+
+#: g10/trust.c:161
+msgid "[ full ]"
+msgstr "[ full ]"
+
+#: g10/trust.c:162
+msgid "[ultimate]"
+msgstr "[ultimate]"
+
+#: g10/verify.c:117
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+
+#: g10/verify.c:204
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "input line %u too long or missing LF\n"
+
+#: g10/verify.c:253
+#, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "can't open fd %d: %s\n"
+
+#: kbx/kbxutil.c:92
+msgid "set debugging flags"
+msgstr "set debugging flags"
+
+#: kbx/kbxutil.c:93
+msgid "enable full debugging"
+msgstr "enable full debugging"
+
+#: kbx/kbxutil.c:117
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Usage: kbxutil [options] [files] (-h for help)"
+
+#: kbx/kbxutil.c:120
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"List, export, import Keybox data\n"
+msgstr ""
+"Syntax: kbxutil [options] [files]\n"
+"List, export, import Keybox data\n"
+
+#: scd/app-nks.c:714 scd/app-openpgp.c:2995
+#, 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:722 scd/app-openpgp.c:3007
+#, 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:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
+#: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
+#: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 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:835
+msgid "the NullPIN has not yet been changed\n"
+msgstr "the NullPIN has not yet been changed\n"
+
+#: scd/app-nks.c:1096
+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:1097
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Please enter the PIN for the standard keys."
+
+#: scd/app-nks.c:1103
+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:1105
+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:1113
+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:1115
+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:1123
+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:1125
+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:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "error getting new PIN: %s\n"
+
+#: scd/app-openpgp.c:805
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "failed to store the fingerprint: %s\n"
+
+#: scd/app-openpgp.c:818
+#, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "failed to store the creation date: %s\n"
+
+#: scd/app-openpgp.c:1286
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "reading public key failed: %s\n"
+
+#: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
+msgid "response does not contain the public key data\n"
+msgstr "response does not contain the public key data\n"
+
+#: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
+msgid "response does not contain the RSA modulus\n"
+msgstr "response does not contain the RSA modulus\n"
+
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
+msgid "response does not contain the RSA public exponent\n"
+msgstr "response does not contain the RSA public exponent\n"
+
+#: scd/app-openpgp.c:1322
+msgid "response does not contain the EC public point\n"
+msgstr "response does not contain the EC public point\n"
+
+#: scd/app-openpgp.c:1708
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr "using default PIN as %s\n"
+
+#: scd/app-openpgp.c:1715
+#, 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:1730
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Please enter the PIN%%0A[sigs done: %lu]"
+
+#: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
+msgid "||Please enter the PIN"
+msgstr "||Please enter the PIN"
+
+#: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
+#, 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:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
+#: scd/app-openpgp.c:3937
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "verify CHV%d failed: %s\n"
+
+#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
+msgid "error retrieving CHV status from card\n"
+msgstr "error retrieving CHV status from card\n"
+
+#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
+msgid "card is permanently locked!\n"
+msgstr "card is permanently locked!\n"
+
+#: scd/app-openpgp.c:1877
+#, c-format
+msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
+msgid_plural ""
+"%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr[0] "%d Admin PIN attempt remaining before card is permanently locked\n"
+msgstr[1] "%d Admin PIN attempts remaining before card is permanently locked\n"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string. Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1887
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+
+#: scd/app-openpgp.c:1891
+msgid "|A|Please enter the Admin PIN"
+msgstr "|A|Please enter the Admin PIN"
+
+#: scd/app-openpgp.c:1912
+msgid "access to admin commands is not configured\n"
+msgstr "access to admin commands is not configured\n"
+
+#: scd/app-openpgp.c:2265
+msgid "||Please enter the Reset Code for the card"
+msgstr "||Please enter the Reset Code for the card"
+
+#: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
+#, 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:2298
+msgid "|RN|New Reset Code"
+msgstr "|RN|New Reset Code"
+
+#: scd/app-openpgp.c:2299
+msgid "|AN|New Admin PIN"
+msgstr "|AN|New Admin PIN"
+
+#: scd/app-openpgp.c:2299
+msgid "|N|New PIN"
+msgstr "|N|New PIN"
+
+#: scd/app-openpgp.c:2370
+msgid "||Please enter the Admin PIN and New Admin PIN"
+msgstr "||Please enter the Admin PIN and New Admin PIN"
+
+#: scd/app-openpgp.c:2371
+msgid "||Please enter the PIN and New PIN"
+msgstr "||Please enter the PIN and New PIN"
+
+#: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
+msgid "error reading application data\n"
+msgstr "error reading application data\n"
+
+#: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
+msgid "error reading fingerprint DO\n"
+msgstr "error reading fingerprint DO\n"
+
+#: scd/app-openpgp.c:2443
+msgid "key already exists\n"
+msgstr "key already exists\n"
+
+#: scd/app-openpgp.c:2447
+msgid "existing key will be replaced\n"
+msgstr "existing key will be replaced\n"
+
+#: scd/app-openpgp.c:2449
+msgid "generating new key\n"
+msgstr "generating new key\n"
+
+#: scd/app-openpgp.c:2451
+msgid "writing new key\n"
+msgstr "writing new key\n"
+
+#: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
+msgid "creation timestamp missing\n"
+msgstr "creation timestamp missing\n"
+
+#: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
+#, 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:3158 scd/app-openpgp.c:3418
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "failed to store the key: %s\n"
+
+#: scd/app-openpgp.c:3320
+msgid "unsupported curve\n"
+msgstr "unsupported curve\n"
+
+#: scd/app-openpgp.c:3577
+msgid "please wait while key is being generated ...\n"
+msgstr "please wait while key is being generated ...\n"
+
+#: scd/app-openpgp.c:3590
+msgid "generating key failed\n"
+msgstr "generating key failed\n"
+
+#: scd/app-openpgp.c:3596
+#, 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:3661
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
+
+#: scd/app-openpgp.c:3711
+msgid "fingerprint on card does not match requested one\n"
+msgstr "fingerprint on card does not match requested one\n"
+
+#: scd/app-openpgp.c:3827
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "card does not support digest algorithm %s\n"
+
+#: scd/app-openpgp.c:3912
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signatures created so far: %lu\n"
+
+#: scd/app-openpgp.c:4365
+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:4659 scd/app-openpgp.c:4670
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "can't access %s - invalid OpenPGP card?\n"
+
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's pinpad"
+msgstr "||Please enter your PIN at the reader's pinpad"
+
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string. We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-dinsig.c:529
+msgid "|N|Initial New PIN"
+msgstr "|N|Initial New PIN"
+
+#: scd/scdaemon.c:114
+msgid "run in multi server mode (foreground)"
+msgstr "run in multi server mode (foreground)"
+
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr "|LEVEL|set the debugging level to LEVEL"
+
+#: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
+msgid "|FILE|write a log to FILE"
+msgstr "|FILE|write a log to FILE"
+
+#: scd/scdaemon.c:134
+msgid "|N|connect to reader at port N"
+msgstr "|N|connect to reader at port N"
+
+#: scd/scdaemon.c:136
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NAME|use NAME as ct-API driver"
+
+#: scd/scdaemon.c:138
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NAME|use NAME as PC/SC driver"
+
+#: scd/scdaemon.c:141
+msgid "do not use the internal CCID driver"
+msgstr "do not use the internal CCID driver"
+
+#: scd/scdaemon.c:147
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr "|N|disconnect the card after N seconds of inactivity"
+
+#: scd/scdaemon.c:150
+msgid "do not use a reader's pinpad"
+msgstr "do not use a reader's pinpad"
+
+#: scd/scdaemon.c:155
+msgid "deny the use of admin card commands"
+msgstr "deny the use of admin card commands"
+
+#: scd/scdaemon.c:158
+msgid "use variable length input for pinpad"
+msgstr "use variable length input for pinpad"
+
+#: scd/scdaemon.c:287
+msgid "Usage: @SCDAEMON@ [options] (-h for help)"
+msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
+
+#: scd/scdaemon.c:289
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for @GNUPG@\n"
+msgstr ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for @GNUPG@\n"
+
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
+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:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr "handler for fd %d started\n"
+
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
+#, c-format
+msgid "handler for fd %d terminated\n"
+msgstr "handler for fd %d terminated\n"
+
+#: sm/base64.c:327
+#, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "invalid radix64 character %02x skipped\n"
+
+#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
+msgid "no dirmngr running in this session\n"
+msgstr "no dirmngr running in this session\n"
+
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr "validation model requested by certificate: %s"
+
+#: sm/certchain.c:195 sm/certchain.c:1919
+msgid "chain"
+msgstr "chain"
+
+#: sm/certchain.c:196 sm/certchain.c:1919
+msgid "shell"
+msgstr "shell"
+
+#: sm/certchain.c:256 dirmngr/validate.c:107
+#, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "critical certificate extension %s is not supported"
+
+#: sm/certchain.c:295 dirmngr/validate.c:205
+msgid "issuer certificate is not marked as a CA"
+msgstr "issuer certificate is not marked as a CA"
+
+#: sm/certchain.c:333
+msgid "critical marked policy without configured policies"
+msgstr "critical marked policy without configured policies"
+
+#: sm/certchain.c:343
+#, c-format
+msgid "failed to open '%s': %s\n"
+msgstr "failed to open '%s': %s\n"
+
+#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
+msgid "Note: non-critical certificate policy not allowed"
+msgstr "Note: non-critical certificate policy not allowed"
+
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
+msgid "certificate policy not allowed"
+msgstr "certificate policy not allowed"
+
+#: sm/certchain.c:527
+msgid "looking up issuer at external location\n"
+msgstr "looking up issuer at external location\n"
+
+#: sm/certchain.c:546
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr "number of issuers matching: %d\n"
+
+#: sm/certchain.c:590
+msgid "looking up issuer from the Dirmngr cache\n"
+msgstr "looking up issuer from the Dirmngr cache\n"
+
+#: sm/certchain.c:614
+#, c-format
+msgid "number of matching certificates: %d\n"
+msgstr "number of matching certificates: %d\n"
+
+#: sm/certchain.c:616
+#, c-format
+msgid "dirmngr cache-only key lookup failed: %s\n"
+msgstr "dirmngr cache-only key lookup failed: %s\n"
+
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
+#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
+msgid "failed to allocate keyDB handle\n"
+msgstr "failed to allocate keyDB handle\n"
+
+#: sm/certchain.c:981
+msgid "certificate has been revoked"
+msgstr "certificate has been revoked"
+
+#: sm/certchain.c:996
+msgid "the status of the certificate is unknown"
+msgstr "the status of the certificate is unknown"
+
+#: sm/certchain.c:1003
+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:1009
+#, c-format
+msgid "checking the CRL failed: %s"
+msgstr "checking the CRL failed: %s"
+
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr "certificate with invalid validity: %s"
+
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
+msgid "certificate not yet valid"
+msgstr "certificate not yet valid"
+
+#: sm/certchain.c:1054 sm/certchain.c:1139
+msgid "root certificate not yet valid"
+msgstr "root certificate not yet valid"
+
+#: sm/certchain.c:1055 sm/certchain.c:1140
+msgid "intermediate certificate not yet valid"
+msgstr "intermediate certificate not yet valid"
+
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
+msgid "certificate has expired"
+msgstr "certificate has expired"
+
+#: sm/certchain.c:1069
+msgid "root certificate has expired"
+msgstr "root certificate has expired"
+
+#: sm/certchain.c:1070
+msgid "intermediate certificate has expired"
+msgstr "intermediate certificate has expired"
+
+#: sm/certchain.c:1112
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
+msgstr "required certificate attributes missing: %s%s%s"
+
+#: sm/certchain.c:1121
+msgid "certificate with invalid validity"
+msgstr "certificate with invalid validity"
+
+#: sm/certchain.c:1158
+msgid "signature not created during lifetime of certificate"
+msgstr "signature not created during lifetime of certificate"
+
+#: sm/certchain.c:1160
+msgid "certificate not created during lifetime of issuer"
+msgstr "certificate not created during lifetime of issuer"
+
+#: sm/certchain.c:1161
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr "intermediate certificate not created during lifetime of issuer"
+
+#: sm/certchain.c:1165
+msgid " ( signature created at "
+msgstr " ( signature created at "
+
+#: sm/certchain.c:1166
+msgid " (certificate created at "
+msgstr " (certificate created at "
+
+#: sm/certchain.c:1169
+msgid " (certificate valid from "
+msgstr " (certificate valid from "
+
+#: sm/certchain.c:1170
+msgid " ( issuer valid from "
+msgstr " ( issuer valid from "
+
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
+#, c-format
+msgid "fingerprint=%s\n"
+msgstr "fingerprint=%s\n"
+
+#: sm/certchain.c:1209
+msgid "root certificate has now been marked as trusted\n"
+msgstr "root certificate has now been marked as trusted\n"
+
+#: sm/certchain.c:1222
+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:1228
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr "interactive marking as trusted disabled for this session\n"
+
+#: sm/certchain.c:1286
+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:1350
+msgid "no issuer found in certificate"
+msgstr "no issuer found in certificate"
+
+#: sm/certchain.c:1428
+msgid "self-signed certificate has a BAD signature"
+msgstr "self-signed certificate has a BAD signature"
+
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
+msgid "root certificate is not marked trusted"
+msgstr "root certificate is not marked trusted"
+
+#: sm/certchain.c:1513
+#, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "checking the trust list failed: %s\n"
+
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
+msgid "certificate chain too long\n"
+msgstr "certificate chain too long\n"
+
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
+msgid "issuer certificate not found"
+msgstr "issuer certificate not found"
+
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
+msgid "certificate has a BAD signature"
+msgstr "certificate has a BAD signature"
+
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
+msgid "found another possible matching CA certificate - trying again"
+msgstr "found another possible matching CA certificate - trying again"
+
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr "certificate chain longer than allowed by CA (%d)"
+
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
+msgid "certificate is good\n"
+msgstr "certificate is good\n"
+
+#: sm/certchain.c:1723
+msgid "intermediate certificate is good\n"
+msgstr "intermediate certificate is good\n"
+
+#: sm/certchain.c:1724
+msgid "root certificate is good\n"
+msgstr "root certificate is good\n"
+
+#: sm/certchain.c:1906
+msgid "switching to chain model"
+msgstr "switching to chain model"
+
+#: sm/certchain.c:1915
+#, c-format
+msgid "validation model used: %s"
+msgstr "validation model used: %s"
+
+#: sm/certcheck.c:107
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr "a %u bit hash is not valid for a %u bit %s key\n"
+
+#: sm/certcheck.c:244 sm/verify.c:202
+msgid "(this is the MD2 algorithm)\n"
+msgstr "(this is the MD2 algorithm)\n"
+
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
+msgid "none"
+msgstr "none"
+
+#: sm/certdump.c:552 sm/certdump.c:617
+msgid "[Error - invalid encoding]"
+msgstr "[Error - invalid encoding]"
+
+#: sm/certdump.c:560
+msgid "[Error - out of core]"
+msgstr "[Error - out of core]"
+
+#: sm/certdump.c:596
+msgid "[Error - No name]"
+msgstr "[Error - No name]"
+
+#: sm/certdump.c:623
+msgid "[Error - invalid DN]"
+msgstr "[Error - invalid DN]"
+
+#: sm/certdump.c:833
+#, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for the X.509 "
+"certificate:\n"
+"\"%s\"\n"
+"S/N %s, ID 0x%08lX,\n"
+"created %s, expires %s.\n"
+msgstr ""
+"Please enter the passphrase to unlock the secret key for the X.509 "
+"certificate:\n"
+"“[1m%s[0m”\n"
+"S/N %s, ID 0x%08lX,\n"
+"created %s, expires %s.\n"
+
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
+msgid "no key usage specified - assuming all usages\n"
+msgstr "no key usage specified - assuming all usages\n"
+
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "error getting key usage information: %s\n"
+
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
+msgid "certificate should not have been used for certification\n"
+msgstr "certificate should not have been used for certification\n"
+
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
+msgid "certificate should not have been used for OCSP response signing\n"
+msgstr "certificate should not have been used for OCSP response signing\n"
+
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
+msgid "certificate should not have been used for encryption\n"
+msgstr "certificate should not have been used for encryption\n"
+
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
+msgid "certificate should not have been used for signing\n"
+msgstr "certificate should not have been used for signing\n"
+
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
+msgid "certificate is not usable for encryption\n"
+msgstr "certificate is not usable for encryption\n"
+
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
+msgid "certificate is not usable for signing\n"
+msgstr "certificate is not usable for signing\n"
+
+#: sm/certreqgen.c:464
+#, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "line %d: invalid algorithm\n"
+
+#: sm/certreqgen.c:478
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr "line %d: invalid key length %u (valid are %d to %d)\n"
+
+#: sm/certreqgen.c:496
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr "line %d: no subject name given\n"
+
+#: sm/certreqgen.c:505
+#, c-format
+msgid "line %d: invalid subject name label '%.*s'\n"
+msgstr "line %d: invalid subject name label ‘[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:1324
+msgid ""
+"To complete this certificate request please enter the passphrase for the key "
+"you just created once more.\n"
+msgstr ""
+"To complete this certificate request please enter the passphrase for the key "
+"you just created once more.\n"
+
+#: sm/certreqgen-ui.c:162
+#, c-format
+msgid " (%d) RSA\n"
+msgstr " (%d) RSA\n"
+
+#: sm/certreqgen-ui.c:163
+#, c-format
+msgid " (%d) Existing key\n"
+msgstr " (%d) Existing key\n"
+
+#: sm/certreqgen-ui.c:164
+#, c-format
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) Existing key from card\n"
+
+#: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
+#, c-format
+msgid "error reading the card: %s\n"
+msgstr "error reading the card: %s\n"
+
+#: sm/certreqgen-ui.c:237
+#, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "Serial number of the card: %s\n"
+
+#: sm/certreqgen-ui.c:249
+msgid "Available keys:\n"
+msgstr "Available keys:\n"
+
+#: sm/certreqgen-ui.c:280
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr "Possible actions for a %s key:\n"
+
+#: sm/certreqgen-ui.c:281
+#, c-format
+msgid " (%d) sign, encrypt\n"
+msgstr " (%d) sign, encrypt\n"
+
+#: sm/certreqgen-ui.c:282
+#, c-format
+msgid " (%d) sign\n"
+msgstr " (%d) sign\n"
+
+#: sm/certreqgen-ui.c:283
+#, c-format
+msgid " (%d) encrypt\n"
+msgstr " (%d) encrypt\n"
+
+#: sm/certreqgen-ui.c:307
+msgid "Enter the X.509 subject name: "
+msgstr "Enter the X.509 subject name: "
+
+#: sm/certreqgen-ui.c:311
+msgid "No subject name given\n"
+msgstr "No subject name given\n"
+
+#: sm/certreqgen-ui.c:315
+#, c-format
+msgid "Invalid subject name label '%.*s'\n"
+msgstr "Invalid subject name label ‘[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:324
+#, c-format
+msgid "Invalid subject name '%s'\n"
+msgstr "Invalid subject name ‘[1m%s[0m’\n"
+
+#: sm/certreqgen-ui.c:326
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+
+#: sm/certreqgen-ui.c:338
+msgid "Enter email addresses"
+msgstr "Enter email addresses"
+
+#: sm/certreqgen-ui.c:339
+msgid " (end with an empty line):\n"
+msgstr " (end with an empty line):\n"
+
+#: sm/certreqgen-ui.c:343
+msgid "Enter DNS names"
+msgstr "Enter DNS names"
+
+#: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
+msgid " (optional; end with an empty line):\n"
+msgstr " (optional; end with an empty line):\n"
+
+#: sm/certreqgen-ui.c:348
+msgid "Enter URIs"
+msgstr "Enter URIs"
+
+#: sm/certreqgen-ui.c:355
+msgid "Create self-signed certificate? (y/N) "
+msgstr "Create self-signed certificate? (y/N) "
+
+#: sm/certreqgen-ui.c:382
+msgid "These parameters are used:\n"
+msgstr "These parameters are used:\n"
+
+#: sm/certreqgen-ui.c:400
+msgid "Now creating self-signed certificate. "
+msgstr "Now creating self-signed certificate. "
+
+#: sm/certreqgen-ui.c:402
+msgid "Now creating certificate request. "
+msgstr "Now creating certificate request. "
+
+#: sm/certreqgen-ui.c:403
+msgid "This may take a while ...\n"
+msgstr "This may take a while ...\n"
+
+#: sm/certreqgen-ui.c:414
+msgid "Ready.\n"
+msgstr "Ready.\n"
+
+#: sm/certreqgen-ui.c:417
+msgid "Ready. You should now send this request to your CA.\n"
+msgstr "Ready. You should now send this request to your CA.\n"
+
+#: sm/certreqgen-ui.c:423
+msgid "resource problem: out of core\n"
+msgstr "resource problem: out of core\n"
+
+#: sm/decrypt.c:330
+msgid "(this is the RC2 algorithm)\n"
+msgstr "(this is the RC2 algorithm)\n"
+
+#: sm/decrypt.c:332
+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:1223 sm/keydb.c:1321
+#, c-format
+msgid "error locking keybox: %s\n"
+msgstr "error locking keybox: %s\n"
+
+#: sm/delete.c:143
+#, c-format
+msgid "duplicated certificate '%s' deleted\n"
+msgstr "duplicated certificate ‘[1m%s[0m’ deleted\n"
+
+#: sm/delete.c:145
+#, c-format
+msgid "certificate '%s' deleted\n"
+msgstr "certificate ‘[1m%s[0m’ deleted\n"
+
+#: sm/delete.c:175
+#, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "deleting certificate “[1m%s[0m” failed: %s\n"
+
+#: sm/encrypt.c:328
+msgid "no valid recipients given\n"
+msgstr "no valid recipients given\n"
+
+#: sm/gpgsm.c:207
+msgid "list external keys"
+msgstr "list external keys"
+
+#: sm/gpgsm.c:209
+msgid "list certificate chain"
+msgstr "list certificate chain"
+
+#: sm/gpgsm.c:216
+msgid "import certificates"
+msgstr "import certificates"
+
+#: sm/gpgsm.c:217
+msgid "export certificates"
+msgstr "export certificates"
+
+#: sm/gpgsm.c:225
+msgid "register a smartcard"
+msgstr "register a smartcard"
+
+#: sm/gpgsm.c:228
+msgid "pass a command to the dirmngr"
+msgstr "pass a command to the dirmngr"
+
+#: sm/gpgsm.c:230
+msgid "invoke gpg-protect-tool"
+msgstr "invoke gpg-protect-tool"
+
+#: sm/gpgsm.c:246
+msgid "create base-64 encoded output"
+msgstr "create base-64 encoded output"
+
+#: sm/gpgsm.c:254
+msgid "assume input is in PEM format"
+msgstr "assume input is in PEM format"
+
+#: sm/gpgsm.c:256
+msgid "assume input is in base-64 format"
+msgstr "assume input is in base-64 format"
+
+#: sm/gpgsm.c:258
+msgid "assume input is in binary format"
+msgstr "assume input is in binary format"
+
+#: sm/gpgsm.c:265
+msgid "never consult a CRL"
+msgstr "never consult a CRL"
+
+#: sm/gpgsm.c:275
+msgid "check validity using OCSP"
+msgstr "check validity using OCSP"
+
+#: sm/gpgsm.c:280
+msgid "|N|number of certificates to include"
+msgstr "|N|number of certificates to include"
+
+#: sm/gpgsm.c:283
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|take policy information from FILE"
+
+#: sm/gpgsm.c:286
+msgid "do not check certificate policies"
+msgstr "do not check certificate policies"
+
+#: sm/gpgsm.c:290
+msgid "fetch missing issuer certificates"
+msgstr "fetch missing issuer certificates"
+
+#: sm/gpgsm.c:301
+msgid "don't use the terminal at all"
+msgstr "don't use the terminal at all"
+
+#: sm/gpgsm.c:303
+msgid "|FILE|write a server mode log to FILE"
+msgstr "|FILE|write a server mode log to FILE"
+
+#: sm/gpgsm.c:308
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|write an audit log to FILE"
+
+#: sm/gpgsm.c:311
+msgid "batch mode: never ask"
+msgstr "batch mode: never ask"
+
+#: sm/gpgsm.c:312
+msgid "assume yes on most questions"
+msgstr "assume yes on most questions"
+
+#: sm/gpgsm.c:313
+msgid "assume no on most questions"
+msgstr "assume no on most questions"
+
+#: sm/gpgsm.c:316
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|add keyring to the list of keyrings"
+
+#: sm/gpgsm.c:319
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|use USER-ID as default secret key"
+
+#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|use this keyserver to lookup keys"
+
+#: sm/gpgsm.c:346
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|use cipher algorithm NAME"
+
+#: sm/gpgsm.c:348
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|use message digest algorithm NAME"
+
+#: sm/gpgsm.c:564
+msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
+msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
+
+#: sm/gpgsm.c:567
+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:771
+#, 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:782
+#, c-format
+msgid "unknown validation model '%s'\n"
+msgstr "unknown validation model ‘[1m%s[0m’\n"
+
+#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "%s:%u: no hostname given\n"
+
+#: sm/gpgsm.c:852 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:873 dirmngr/ldapserver.c:126
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: skipping this line\n"
+
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
+msgid "could not parse keyserver\n"
+msgstr "could not parse keyserver\n"
+
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
+#, c-format
+msgid "importing common certificates '%s'\n"
+msgstr "importing common certificates ‘[1m%s[0m’\n"
+
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
+#, c-format
+msgid "can't sign using '%s': %s\n"
+msgstr "can't sign using '%s': %s\n"
+
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
+msgid "invalid command (there is no implicit command)\n"
+msgstr "invalid command (there is no implicit command)\n"
+
+#: sm/import.c:127
+#, c-format
+msgid "total number processed: %lu\n"
+msgstr "total number processed: %lu\n"
+
+#: sm/import.c:246
+msgid "error storing certificate\n"
+msgstr "error storing certificate\n"
+
+#: sm/import.c:254
+msgid "basic certificate checks failed - not imported\n"
+msgstr "basic certificate checks failed - not imported\n"
+
+#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
+#, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "error getting stored flags: %s\n"
+
+#: sm/import.c:526 sm/import.c:558
+#, c-format
+msgid "error importing certificate: %s\n"
+msgstr "error importing certificate: %s\n"
+
+#: sm/import.c:746 tools/gpg-connect-agent.c:1433
+#, c-format
+msgid "error reading input: %s\n"
+msgstr "error reading input: %s\n"
+
+#: sm/keydb.c:1120 sm/keydb.c:1206
+msgid "failed to get the fingerprint\n"
+msgstr "failed to get the fingerprint\n"
+
+#: sm/keydb.c:1162
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr "problem looking for existing certificate: %s\n"
+
+#: sm/keydb.c:1174
+#, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "error finding writable keyDB: %s\n"
+
+#: sm/keydb.c:1182
+#, c-format
+msgid "error storing certificate: %s\n"
+msgstr "error storing certificate: %s\n"
+
+#: sm/keydb.c:1234
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "problem re-searching certificate: %s\n"
+
+#: sm/keydb.c:1255 sm/keydb.c:1344
+#, c-format
+msgid "error storing flags: %s\n"
+msgstr "error storing flags: %s\n"
+
- #: sm/keylist.c:658
++#: sm/keylist.c:657
+msgid "Error - "
+msgstr "Error - "
+
+#: sm/misc.c:58
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr "GPG_TTY has not been set - using maybe bogus default\n"
+
+#: sm/qualified.c:105
+#, c-format
+msgid "invalid formatted fingerprint in '%s', line %d\n"
+msgstr "invalid formatted fingerprint in '%s', line %d\n"
+
+#: sm/qualified.c:123
+#, c-format
+msgid "invalid country code in '%s', line %d\n"
+msgstr "invalid country code in '%s', line %d\n"
+
+#: sm/qualified.c:206
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+"You are about to create a signature using your certificate:\n"
+"“[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:617
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+
+#: sm/qualified.c:282
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+"You are about to create a signature using your certificate:\n"
+"“[1m%s[0m”\n"
+"Note, that this certificate will NOT create a qualified signature!"
+
+#: sm/sign.c:451
+#, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+
+#: sm/sign.c:465
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr "hash algorithm used for signer %d: %s (%s)\n"
+
+#: sm/sign.c:517
+#, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "checking for qualified certificate failed: %s\n"
+
+#: sm/verify.c:450
+msgid "Signature made "
+msgstr "Signature made "
+
+#: sm/verify.c:454
+msgid "[date not given]"
+msgstr "[date not given]"
+
+#: sm/verify.c:455
+#, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr " using certificate ID 0x%08lX\n"
+
+#: sm/verify.c:474
+msgid ""
+"invalid signature: message digest attribute does not match computed one\n"
+msgstr ""
+"invalid signature: message digest attribute does not match computed one\n"
+
+#: sm/verify.c:595
+msgid "Good signature from"
+msgstr "Good signature from"
+
+#: sm/verify.c:596
+msgid " aka"
+msgstr " aka"
+
+#: sm/verify.c:614
+msgid "This is a qualified signature\n"
+msgstr "This is a qualified signature\n"
+
+#: dirmngr/certcache.c:106
+#, c-format
+msgid "can't initialize certificate cache lock: %s\n"
+msgstr "can't initialize certificate cache lock: %s\n"
+
+#: dirmngr/certcache.c:117
+#, c-format
+msgid "can't acquire read lock on the certificate cache: %s\n"
+msgstr "can't acquire read lock on the certificate cache: %s\n"
+
+#: dirmngr/certcache.c:128
+#, c-format
+msgid "can't acquire write lock on the certificate cache: %s\n"
+msgstr "can't acquire write lock on the certificate cache: %s\n"
+
+#: dirmngr/certcache.c:139
+#, c-format
+msgid "can't release lock on the certificate cache: %s\n"
+msgstr "can't release lock on the certificate cache: %s\n"
+
+#: dirmngr/certcache.c:267
+#, c-format
+msgid "dropping %u certificates from the cache\n"
+msgstr "dropping %u certificates from the cache\n"
+
- #: dirmngr/certcache.c:352
- #, c-format
- msgid "can't access directory '%s': %s\n"
- msgstr "can't access directory '%s': %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
+#, c-format
+msgid "can't parse certificate '%s': %s\n"
+msgstr "can't parse certificate '%s': %s\n"
+
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
+#, c-format
+msgid "certificate '%s' already cached\n"
+msgstr "certificate ‘[1m%s[0m’ already cached\n"
+
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
+#, c-format
+msgid "trusted certificate '%s' loaded\n"
+msgstr "trusted certificate ‘[1m%s[0m’ loaded\n"
+
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
+#, c-format
+msgid "certificate '%s' loaded\n"
+msgstr "certificate ‘[1m%s[0m’ loaded\n"
+
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
+#, c-format
+msgid " SHA1 fingerprint = %s\n"
+msgstr " SHA1 fingerprint = %s\n"
+
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
+msgid " issuer ="
+msgstr " issuer ="
+
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
+msgid " subject ="
+msgstr " subject ="
+
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
+#, c-format
+msgid "error loading certificate '%s': %s\n"
+msgstr "error loading certificate '%s': %s\n"
+
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
+#, c-format
+msgid "permanently loaded certificates: %u\n"
+msgstr "permanently loaded certificates: %u\n"
+
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
+#, c-format
+msgid " runtime cached certificates: %u\n"
+msgstr " runtime cached certificates: %u\n"
+
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
+msgid "certificate already cached\n"
+msgstr "certificate already cached\n"
+
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
+msgid "certificate cached\n"
+msgstr "certificate cached\n"
+
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
+#, c-format
+msgid "error caching certificate: %s\n"
+msgstr "error caching certificate: %s\n"
+
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
+#, c-format
+msgid "invalid SHA1 fingerprint string '%s'\n"
+msgstr "invalid SHA1 fingerprint string ‘[1m%s[0m’\n"
+
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
+#, c-format
+msgid "error fetching certificate by S/N: %s\n"
+msgstr "error fetching certificate by S/N: %s\n"
+
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
+#, c-format
+msgid "error fetching certificate by subject: %s\n"
+msgstr "error fetching certificate by subject: %s\n"
+
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
+msgid "no issuer found in certificate\n"
+msgstr "no issuer found in certificate\n"
+
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
+#, c-format
+msgid "error getting authorityKeyIdentifier: %s\n"
+msgstr "error getting authorityKeyIdentifier: %s\n"
+
+#: dirmngr/crlcache.c:213
+#, c-format
+msgid "creating directory '%s'\n"
+msgstr "creating directory ‘[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:2207
+#, c-format
+msgid "error closing cache file: %s\n"
+msgstr "error closing cache file: %s\n"
+
+#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
+#, c-format
+msgid "failed to open cache dir file '%s': %s\n"
+msgstr "failed to open cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:421
+#, c-format
+msgid "error creating new cache dir file '%s': %s\n"
+msgstr "error creating new cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:428
+#, c-format
+msgid "error writing new cache dir file '%s': %s\n"
+msgstr "error writing new cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:435
+#, c-format
+msgid "error closing new cache dir file '%s': %s\n"
+msgstr "error closing new cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:440
+#, c-format
+msgid "new cache dir file '%s' created\n"
+msgstr "new cache dir file ‘[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:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
+#, 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:174
+#, c-format
+msgid "converting S-expression failed: %s\n"
+msgstr "converting S-expression failed: %s\n"
+
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
+#, c-format
+msgid "creating S-expression failed: %s\n"
+msgstr "creating S-expression failed: %s\n"
+
+#: dirmngr/crlcache.c:1699
+#, c-format
+msgid "ksba_crl_parse failed: %s\n"
+msgstr "ksba_crl_parse failed: %s\n"
+
+#: dirmngr/crlcache.c:1714
+#, c-format
+msgid "error getting update times of CRL: %s\n"
+msgstr "error getting update times of CRL: %s\n"
+
+#: dirmngr/crlcache.c:1721
+#, c-format
+msgid "update times of this CRL: this=%s next=%s\n"
+msgstr "update times of this CRL: this=%s next=%s\n"
+
+#: dirmngr/crlcache.c:1725
+msgid "nextUpdate not given; assuming a validity period of one day\n"
+msgstr "nextUpdate not given; assuming a validity period of one day\n"
+
+#: dirmngr/crlcache.c:1745
+#, c-format
+msgid "error getting CRL item: %s\n"
+msgstr "error getting CRL item: %s\n"
+
+#: dirmngr/crlcache.c:1760
+#, c-format
+msgid "error inserting item into temporary cache file: %s\n"
+msgstr "error inserting item into temporary cache file: %s\n"
+
+#: dirmngr/crlcache.c:1787
+#, c-format
+msgid "no CRL issuer found in CRL: %s\n"
+msgstr "no CRL issuer found in CRL: %s\n"
+
+#: dirmngr/crlcache.c:1802
+msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
+msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
+
+#: dirmngr/crlcache.c:1847
+#, c-format
+msgid "CRL signature verification failed: %s\n"
+msgstr "CRL signature verification failed: %s\n"
+
+#: dirmngr/crlcache.c:1858
+#, c-format
+msgid "error checking validity of CRL issuer certificate: %s\n"
+msgstr "error checking validity of CRL issuer certificate: %s\n"
+
+#: dirmngr/crlcache.c:2001
+#, c-format
+msgid "ksba_crl_new failed: %s\n"
+msgstr "ksba_crl_new failed: %s\n"
+
+#: dirmngr/crlcache.c:2008
+#, c-format
+msgid "ksba_crl_set_reader failed: %s\n"
+msgstr "ksba_crl_set_reader failed: %s\n"
+
+#: dirmngr/crlcache.c:2042
+#, c-format
+msgid "removed stale temporary cache file '%s'\n"
+msgstr "removed stale temporary cache file ‘[1m%s[0m’\n"
+
+#: dirmngr/crlcache.c:2046
+#, c-format
+msgid "problem removing stale temporary cache file '%s': %s\n"
+msgstr "problem removing stale temporary cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:2056
+#, c-format
+msgid "error creating temporary cache file '%s': %s\n"
+msgstr "error creating temporary cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:2066
+#, c-format
+msgid "crl_parse_insert failed: %s\n"
+msgstr "crl_parse_insert failed: %s\n"
+
+#: dirmngr/crlcache.c:2076
+#, c-format
+msgid "error finishing temporary cache file '%s': %s\n"
+msgstr "error finishing temporary cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:2083
+#, c-format
+msgid "error closing temporary cache file '%s': %s\n"
+msgstr "error closing temporary cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:2108
+#, c-format
+msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
+msgstr "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
+
+#: dirmngr/crlcache.c:2112
+#, c-format
+msgid "new CRL still too old; it expired on %s\n"
+msgstr "new CRL still too old; it expired on %s\n"
+
+#: dirmngr/crlcache.c:2128
+#, c-format
+msgid "unknown critical CRL extension %s\n"
+msgstr "unknown critical CRL extension %s\n"
+
+#: dirmngr/crlcache.c:2138
+#, c-format
+msgid "error reading CRL extensions: %s\n"
+msgstr "error reading CRL extensions: %s\n"
+
+#: dirmngr/crlcache.c:2189
+#, c-format
+msgid "creating cache file '%s'\n"
+msgstr "creating cache file ‘[1m%s[0m’\n"
+
+#: dirmngr/crlcache.c:2221
+#, c-format
+msgid "problem renaming '%s' to '%s': %s\n"
+msgstr "problem renaming ‘[1m%s[0m’ to '%s': %s\n"
+
+#: dirmngr/crlcache.c:2235
+msgid ""
+"updating the DIR file failed - cache entry will get lost with the next "
+"program start\n"
+msgstr ""
+"updating the DIR file failed - cache entry will get lost with the next "
+"program start\n"
+
+#: dirmngr/crlcache.c:2272
+#, c-format
+msgid "Begin CRL dump (retrieved via %s)\n"
+msgstr "Begin CRL dump (retrieved via %s)\n"
+
+#: dirmngr/crlcache.c:2295
+msgid ""
+" ERROR: The CRL will not be used because it was still too old after an "
+"update!\n"
+msgstr ""
+" ERROR: The CRL will not be used because it was still too old after an "
+"update!\n"
+
+#: dirmngr/crlcache.c:2298
+msgid ""
+" ERROR: The CRL will not be used due to an unknown critical extension!\n"
+msgstr ""
+" ERROR: The CRL will not be used due to an unknown critical extension!\n"
+
+#: dirmngr/crlcache.c:2301
+msgid " ERROR: The CRL will not be used\n"
+msgstr " ERROR: The CRL will not be used\n"
+
+#: dirmngr/crlcache.c:2308
+msgid " ERROR: This cached CRL may have been tampered with!\n"
+msgstr " ERROR: This cached CRL may have been tampered with!\n"
+
+#: dirmngr/crlcache.c:2326
+msgid " WARNING: invalid cache record length\n"
+msgstr " WARNING: invalid cache record length\n"
+
+#: dirmngr/crlcache.c:2333
+#, c-format
+msgid "problem reading cache record: %s\n"
+msgstr "problem reading cache record: %s\n"
+
+#: dirmngr/crlcache.c:2344
+#, c-format
+msgid "problem reading cache key: %s\n"
+msgstr "problem reading cache key: %s\n"
+
+#: dirmngr/crlcache.c:2375
+#, c-format
+msgid "error reading cache entry from db: %s\n"
+msgstr "error reading cache entry from db: %s\n"
+
+#: dirmngr/crlcache.c:2378
+msgid "End CRL dump\n"
+msgstr "End CRL dump\n"
+
+#: dirmngr/crlcache.c:2499
+#, c-format
+msgid "crl_fetch via DP failed: %s\n"
+msgstr "crl_fetch via DP failed: %s\n"
+
+#: dirmngr/crlcache.c:2510
+#, c-format
+msgid "crl_cache_insert via DP failed: %s\n"
+msgstr "crl_cache_insert via DP failed: %s\n"
+
+#: dirmngr/crlcache.c:2570
+#, c-format
+msgid "crl_cache_insert via issuer failed: %s\n"
+msgstr "crl_cache_insert via issuer failed: %s\n"
+
+#: dirmngr/crlfetch.c:74
+msgid "reader to file mapping table full - waiting\n"
+msgstr "reader to file mapping table full - waiting\n"
+
+#: dirmngr/crlfetch.c:182
+msgid "using \"http\" instead of \"https\"\n"
+msgstr "using “[1mhttp[0m” instead of “[1mhttps[0m”\n"
+
+#: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
+#: dirmngr/crlfetch.c:359
+#, c-format
+msgid "CRL access not possible due to disabled %s\n"
+msgstr "CRL access not possible due to disabled %s\n"
+
+#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
+#: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
+#, c-format
+msgid "error initializing reader object: %s\n"
+msgstr "error initializing reader object: %s\n"
+
+#: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr "URL ‘[1m%s[0m’ redirected to ‘[1m%s[0m’ (%u)\n"
+
+#: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
+msgid "too many redirections\n"
+msgstr "too many redirections\n"
+
+#: dirmngr/crlfetch.c:274
+#, c-format
+msgid "error retrieving '%s': %s\n"
+msgstr "error retrieving '%s': %s\n"
+
+#: dirmngr/crlfetch.c:279
+#, c-format
+msgid "error retrieving '%s': http status %u\n"
+msgstr "error retrieving '%s': http status %u\n"
+
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
+msgid "CRL access not possible due to Tor mode\n"
+msgstr "CRL access not possible due to Tor mode\n"
+
+#: dirmngr/crlfetch.c:386
+#, c-format
+msgid "certificate search not possible due to disabled %s\n"
+msgstr "certificate search not possible due to disabled %s\n"
+
+#: dirmngr/dirmngr-client.c:71
+msgid "use OCSP instead of CRLs"
+msgstr "use OCSP instead of CRLs"
+
+#: dirmngr/dirmngr-client.c:72
+msgid "check whether a dirmngr is running"
+msgstr "check whether a dirmngr is running"
+
+#: dirmngr/dirmngr-client.c:73
+msgid "add a certificate to the cache"
+msgstr "add a certificate to the cache"
+
+#: dirmngr/dirmngr-client.c:74
+msgid "validate a certificate"
+msgstr "validate a certificate"
+
+#: dirmngr/dirmngr-client.c:75
+msgid "lookup a certificate"
+msgstr "lookup a certificate"
+
+#: dirmngr/dirmngr-client.c:76
+msgid "lookup only locally stored certificates"
+msgstr "lookup only locally stored certificates"
+
+#: dirmngr/dirmngr-client.c:77
+msgid "expect an URL for --lookup"
+msgstr "expect an URL for --lookup"
+
+#: dirmngr/dirmngr-client.c:78
+msgid "load a CRL into the dirmngr"
+msgstr "load a CRL into the dirmngr"
+
+#: dirmngr/dirmngr-client.c:79
+msgid "special mode for use by Squid"
+msgstr "special mode for use by Squid"
+
+#: dirmngr/dirmngr-client.c:80
+msgid "expect certificates in PEM format"
+msgstr "expect certificates in PEM format"
+
+#: dirmngr/dirmngr-client.c:82
+msgid "force the use of the default OCSP responder"
+msgstr "force the use of the default OCSP responder"
+
+#: dirmngr/dirmngr-client.c:169
+msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
+msgstr "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
+
+#: dirmngr/dirmngr-client.c:173
+msgid ""
+"Syntax: dirmngr-client [options] [certfile|pattern]\n"
+"Test an X.509 certificate against a CRL or do an OCSP check\n"
+"The process returns 0 if the certificate is valid, 1 if it is\n"
+"not valid and other error codes for general failures\n"
+msgstr ""
+"Syntax: dirmngr-client [options] [certfile|pattern]\n"
+"Test an X.509 certificate against a CRL or do an OCSP check\n"
+"The process returns 0 if the certificate is valid, 1 if it is\n"
+"not valid and other error codes for general failures\n"
+
+#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#, c-format
+msgid "error reading certificate from stdin: %s\n"
+msgstr "error reading certificate from stdin: %s\n"
+
+#: dirmngr/dirmngr-client.c:281
+#, c-format
+msgid "error reading certificate from '%s': %s\n"
+msgstr "error reading certificate from '%s': %s\n"
+
+#: dirmngr/dirmngr-client.c:295
+msgid "certificate too large to make any sense\n"
+msgstr "certificate too large to make any sense\n"
+
+#: dirmngr/dirmngr-client.c:310
+#, c-format
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "can't connect to the dirmngr: %s\n"
+
+#: dirmngr/dirmngr-client.c:332
+#, c-format
+msgid "lookup failed: %s\n"
+msgstr "lookup failed: %s\n"
+
+#: dirmngr/dirmngr-client.c:347
+#, c-format
+msgid "loading CRL '%s' failed: %s\n"
+msgstr "loading CRL ‘[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:159
- msgid "run as windows service (background)"
- msgstr "run as windows service (background)"
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
+msgid "list the contents of the CRL cache"
+msgstr "list the contents of the CRL cache"
+
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
+msgid "|FILE|load CRL from FILE into cache"
+msgstr "|FILE|load CRL from FILE into cache"
+
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
+msgid "|URL|fetch a CRL from URL"
+msgstr "|URL|fetch a CRL from URL"
+
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
+msgid "shutdown the dirmngr"
+msgstr "shutdown the dirmngr"
+
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
+msgid "flush the cache"
+msgstr "flush the cache"
+
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|write server mode logs to FILE"
+
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
+msgid "run without asking a user"
+msgstr "run without asking a user"
+
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
+msgid "force loading of outdated CRLs"
+msgstr "force loading of outdated CRLs"
+
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
+msgid "allow sending OCSP requests"
+msgstr "allow sending OCSP requests"
+
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
+msgid "inhibit the use of HTTP"
+msgstr "inhibit the use of HTTP"
+
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
+msgid "inhibit the use of LDAP"
+msgstr "inhibit the use of LDAP"
+
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
+msgid "ignore HTTP CRL distribution points"
+msgstr "ignore HTTP CRL distribution points"
+
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignore LDAP CRL distribution points"
+
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignore certificate contained OCSP service URLs"
+
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
+msgid "|URL|redirect all HTTP requests to URL"
+msgstr "|URL|redirect all HTTP requests to URL"
+
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
+msgid "|HOST|use HOST for LDAP queries"
+msgstr "|HOST|use HOST for LDAP queries"
+
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
+msgid "do not use fallback hosts with --ldap-proxy"
+msgstr "do not use fallback hosts with --ldap-proxy"
+
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
+msgid "|FILE|read LDAP server list from FILE"
+msgstr "|FILE|read LDAP server list from FILE"
+
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
+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:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
+msgid "|N|set LDAP timeout to N seconds"
+msgstr "|N|set LDAP timeout to N seconds"
+
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
+msgid "|URL|use OCSP responder at URL"
+msgstr "|URL|use OCSP responder at URL"
+
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
+msgid "|FPR|OCSP response signed by FPR"
+msgstr "|FPR|OCSP response signed by FPR"
+
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
+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:222
++#: dirmngr/dirmngr.c:209
+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:224
++#: dirmngr/dirmngr.c:211
+msgid "route all network traffic via Tor"
+msgstr "route all network traffic via Tor"
+
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
+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:353
++#: dirmngr/dirmngr.c:340
+msgid "Usage: @DIRMNGR@ [options] (-h for help)"
+msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
+
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
+msgid ""
+"Syntax: @DIRMNGR@ [options] [command [args]]\n"
+"Keyserver, CRL, and OCSP access for @GNUPG@\n"
+msgstr ""
+"Syntax: @DIRMNGR@ [options] [command [args]]\n"
+"Keyserver, CRL, and OCSP access for @GNUPG@\n"
+
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
+#, c-format
+msgid "valid debug levels are: %s\n"
+msgstr "valid debug levels are: %s\n"
+
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
+#, c-format
+msgid "usage: %s [options] "
+msgstr "usage: %s [options] "
+
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
+msgid "colons are not allowed in the socket name\n"
+msgstr "colons are not allowed in the socket name\n"
+
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
+#, c-format
+msgid "fetching CRL from '%s' failed: %s\n"
+msgstr "fetching CRL from ‘[1m%s[0m’ failed: %s\n"
+
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
+#, c-format
+msgid "processing CRL from '%s' failed: %s\n"
+msgstr "processing CRL from ‘[1m%s[0m’ failed: %s\n"
+
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
+#, c-format
+msgid "%s:%u: line too long - skipped\n"
+msgstr "%s:%u: line too long - skipped\n"
+
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
+#, c-format
+msgid "%s:%u: invalid fingerprint detected\n"
+msgstr "%s:%u: invalid fingerprint detected\n"
+
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
+#, c-format
+msgid "%s:%u: read error: %s\n"
+msgstr "%s:%u: read error: %s\n"
+
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
+#, 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:1807
++#: dirmngr/dirmngr.c:1631
+msgid "SIGHUP received - re-reading configuration and flushing caches\n"
+msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
+
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
+msgid "SIGUSR2 received - no action defined\n"
+msgstr "SIGUSR2 received - no action defined\n"
+
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
+msgid "SIGTERM received - shutting down ...\n"
+msgstr "SIGTERM received - shutting down ...\n"
+
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
+#, c-format
+msgid "SIGTERM received - still %d active connections\n"
+msgstr "SIGTERM received - still %d active connections\n"
+
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
+msgid "shutdown forced\n"
+msgstr "shutdown forced\n"
+
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
+msgid "SIGINT received - immediate shutdown\n"
+msgstr "SIGINT received - immediate shutdown\n"
+
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
+#, c-format
+msgid "signal %d received - no action defined\n"
+msgstr "signal %d received - no action defined\n"
+
+#: dirmngr/dirmngr_ldap.c:138
+msgid "return all values in a record oriented format"
+msgstr "return all values in a record oriented format"
+
+#: dirmngr/dirmngr_ldap.c:141
+msgid "|NAME|ignore host part and connect through NAME"
+msgstr "|NAME|ignore host part and connect through NAME"
+
+#: dirmngr/dirmngr_ldap.c:142
+msgid "|NAME|connect to host NAME"
+msgstr "|NAME|connect to host NAME"
+
+#: dirmngr/dirmngr_ldap.c:143
+msgid "|N|connect to port N"
+msgstr "|N|connect to port N"
+
+#: dirmngr/dirmngr_ldap.c:144
+msgid "|NAME|use user NAME for authentication"
+msgstr "|NAME|use user NAME for authentication"
+
+#: dirmngr/dirmngr_ldap.c:145
+msgid "|PASS|use password PASS for authentication"
+msgstr "|PASS|use password PASS for authentication"
+
+#: dirmngr/dirmngr_ldap.c:147
+msgid "take password from $DIRMNGR_LDAP_PASS"
+msgstr "take password from $DIRMNGR_LDAP_PASS"
+
+#: dirmngr/dirmngr_ldap.c:148
+msgid "|STRING|query DN STRING"
+msgstr "|STRING|query DN STRING"
+
+#: dirmngr/dirmngr_ldap.c:149
+msgid "|STRING|use STRING as filter expression"
+msgstr "|STRING|use STRING as filter expression"
+
+#: dirmngr/dirmngr_ldap.c:150
+msgid "|STRING|return the attribute STRING"
+msgstr "|STRING|return the attribute STRING"
+
+#: dirmngr/dirmngr_ldap.c:209
+msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+msgstr "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+
+#: dirmngr/dirmngr_ldap.c:212
+msgid ""
+"Syntax: dirmngr_ldap [options] [URL]\n"
+"Internal LDAP helper for Dirmngr\n"
+"Interface and options may change without notice\n"
+msgstr ""
+"Syntax: dirmngr_ldap [options] [URL]\n"
+"Internal LDAP helper for Dirmngr\n"
+"Interface and options may change without notice\n"
+
+#: dirmngr/dirmngr_ldap.c:337
+#, c-format
+msgid "invalid port number %d\n"
+msgstr "invalid port number %d\n"
+
+#: dirmngr/dirmngr_ldap.c:413
+#, c-format
+msgid "scanning result for attribute '%s'\n"
+msgstr "scanning result for attribute ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
+#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
+#: dirmngr/dirmngr_ldap.c:677
+#, c-format
+msgid "error writing to stdout: %s\n"
+msgstr "error writing to stdout: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:437
+#, c-format
+msgid " available attribute '%s'\n"
+msgstr " available attribute ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:475
+#, c-format
+msgid "attribute '%s' not found\n"
+msgstr "attribute ‘[1m%s[0m’ not found\n"
+
+#: dirmngr/dirmngr_ldap.c:482
+#, c-format
+msgid "found attribute '%s'\n"
+msgstr "found attribute ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:591
+#, c-format
+msgid "processing url '%s'\n"
+msgstr "processing url ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:593
+#, c-format
+msgid " user '%s'\n"
+msgstr " user ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:595
+#, c-format
+msgid " pass '%s'\n"
+msgstr " pass ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:597
+#, c-format
+msgid " host '%s'\n"
+msgstr " host ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:598
+#, c-format
+msgid " port %d\n"
+msgstr " port %d\n"
+
+#: dirmngr/dirmngr_ldap.c:600
+#, c-format
+msgid " DN '%s'\n"
+msgstr " DN ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:602
+#, c-format
+msgid " filter '%s'\n"
+msgstr " filter ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:607 dirmngr/dirmngr_ldap.c:610
+#, c-format
+msgid " attr '%s'\n"
+msgstr " attr ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:616
+#, c-format
+msgid "no host name in '%s'\n"
+msgstr "no host name in ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:621
+#, c-format
+msgid "no attribute given for query '%s'\n"
+msgstr "no attribute given for query ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:627
+msgid "WARNING: using first attribute only\n"
+msgstr "WARNING: using first attribute only\n"
+
+#: dirmngr/dirmngr_ldap.c:636
+#, c-format
+msgid "LDAP init to '%s:%d' failed: %s\n"
+msgstr "LDAP init to ‘[1m%s:%d[0m’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:659
+#, c-format
+msgid "binding to '%s:%d' failed: %s\n"
+msgstr "binding to ‘[1m%s:%d[0m’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:686
+#, c-format
+msgid "searching '%s' failed: %s\n"
+msgstr "searching ‘[1m%s[0m’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:718
+#, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "‘[1m%s[0m’ is not an LDAP URL\n"
+
+#: dirmngr/dirmngr_ldap.c:724
+#, c-format
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr "‘[1m%s[0m’ is an invalid LDAP URL\n"
+
+#: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
+#: dirmngr/ldap-wrapper.c:693
+#, 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:502
+#, c-format
+msgid "malloc failed: %s\n"
+msgstr "malloc failed: %s\n"
+
+#: dirmngr/ldap.c:627
+#, c-format
+msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgstr "start_cert_fetch: invalid pattern ‘[1m%s[0m’\n"
+
+#: dirmngr/ldap.c:840
+msgid "ldap_search hit the size limit of the server\n"
+msgstr "ldap_search hit the size limit of the server\n"
+
+#: dirmngr/misc.c:170
+msgid "invalid canonical S-expression found\n"
+msgstr "invalid canonical S-expression found\n"
+
+#: dirmngr/misc.c:194 dirmngr/misc.c:228
+#, c-format
+msgid "gcry_md_open failed: %s\n"
+msgstr "gcry_md_open failed: %s\n"
+
+#: dirmngr/misc.c:199 dirmngr/misc.c:233
+#, c-format
+msgid "oops: ksba_cert_hash failed: %s\n"
+msgstr "oops: ksba_cert_hash failed: %s\n"
+
+#: dirmngr/misc.c:518
+msgid "bad URL encoding detected\n"
+msgstr "bad URL encoding detected\n"
+
+#: dirmngr/ocsp.c:80
+#, c-format
+msgid "error reading from responder: %s\n"
+msgstr "error reading from responder: %s\n"
+
+#: dirmngr/ocsp.c:98
+#, c-format
+msgid "response from server too large; limit is %d bytes\n"
+msgstr "response from server too large; limit is %d bytes\n"
+
+#: dirmngr/ocsp.c:139
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "OCSP request not possible due to Tor mode\n"
+
+#: dirmngr/ocsp.c:145
+msgid "OCSP request not possible due to disabled HTTP\n"
+msgstr "OCSP request not possible due to disabled HTTP\n"
+
+#: dirmngr/ocsp.c:152
+#, c-format
+msgid "error setting OCSP target: %s\n"
+msgstr "error setting OCSP target: %s\n"
+
+#: dirmngr/ocsp.c:170
+#, c-format
+msgid "error building OCSP request: %s\n"
+msgstr "error building OCSP request: %s\n"
+
+#: dirmngr/ocsp.c:181
+#, c-format
+msgid "error connecting to '%s': %s\n"
+msgstr "error connecting to '%s': %s\n"
+
+#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
+#, c-format
+msgid "error reading HTTP response for '%s': %s\n"
+msgstr "error reading HTTP response for '%s': %s\n"
+
+#: dirmngr/ocsp.c:240
+#, c-format
+msgid "error accessing '%s': http status %u\n"
+msgstr "error accessing '%s': http status %u\n"
+
+#: dirmngr/ocsp.c:265
+#, c-format
+msgid "error parsing OCSP response for '%s': %s\n"
+msgstr "error parsing OCSP response for '%s': %s\n"
+
+#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
+#, c-format
+msgid "OCSP responder at '%s' status: %s\n"
+msgstr "OCSP responder at ‘[1m%s[0m’ status: %s\n"
+
+#: dirmngr/ocsp.c:293
+#, c-format
+msgid "hashing the OCSP response for '%s' failed: %s\n"
+msgstr "hashing the OCSP response for ‘[1m%s[0m’ failed: %s\n"
+
+#: dirmngr/ocsp.c:328
+msgid "not signed by a default OCSP signer's certificate"
+msgstr "not signed by a default OCSP signer's certificate"
+
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
+msgid "only SHA-1 is supported for OCSP responses\n"
+msgstr "only SHA-1 is supported for OCSP responses\n"
+
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
+#, c-format
+msgid "allocating list item failed: %s\n"
+msgstr "allocating list item failed: %s\n"
+
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
+#, c-format
+msgid "error getting responder ID: %s\n"
+msgstr "error getting responder ID: %s\n"
+
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
+msgid "no suitable certificate found to verify the OCSP response\n"
+msgstr "no suitable certificate found to verify the OCSP response\n"
+
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
+#, c-format
+msgid "issuer certificate not found: %s\n"
+msgstr "issuer certificate not found: %s\n"
+
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
+msgid "caller did not return the target certificate\n"
+msgstr "caller did not return the target certificate\n"
+
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
+msgid "caller did not return the issuing certificate\n"
+msgstr "caller did not return the issuing certificate\n"
+
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
+#, c-format
+msgid "failed to allocate OCSP context: %s\n"
+msgstr "failed to allocate OCSP context: %s\n"
+
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "can't get authorityInfoAccess: %s\n"
+
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
+msgid "no default OCSP responder defined\n"
+msgstr "no default OCSP responder defined\n"
+
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
+msgid "no default OCSP signer defined\n"
+msgstr "no default OCSP signer defined\n"
+
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
+#, c-format
+msgid "using default OCSP responder '%s'\n"
+msgstr "using default OCSP responder ‘[1m%s[0m’\n"
+
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
+#, c-format
+msgid "using OCSP responder '%s'\n"
+msgstr "using OCSP responder ‘[1m%s[0m’\n"
+
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
+#, c-format
+msgid "failed to establish a hashing context for OCSP: %s\n"
+msgstr "failed to establish a hashing context for OCSP: %s\n"
+
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
+#, c-format
+msgid "error getting OCSP status for target certificate: %s\n"
+msgstr "error getting OCSP status for target certificate: %s\n"
+
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
+#, c-format
+msgid "certificate status is: %s (this=%s next=%s)\n"
+msgstr "certificate status is: %s (this=%s next=%s)\n"
+
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
+msgid "good"
+msgstr "good"
+
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
+#, c-format
+msgid "certificate has been revoked at: %s due to: %s\n"
+msgstr "certificate has been revoked at: %s due to: %s\n"
+
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
+msgid "OCSP responder returned a status in the future\n"
+msgstr "OCSP responder returned a status in the future\n"
+
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
+msgid "OCSP responder returned a non-current status\n"
+msgstr "OCSP responder returned a non-current status\n"
+
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
+msgid "OCSP responder returned an too old status\n"
+msgstr "OCSP responder returned an too old status\n"
+
+#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
+#, c-format
+msgid "assuan_inquire(%s) failed: %s\n"
+msgstr "assuan_inquire(%s) failed: %s\n"
+
+#: dirmngr/server.c:893
+msgid "ldapserver missing"
+msgstr "ldapserver missing"
+
+#: dirmngr/server.c:967
+msgid "serialno missing in cert ID"
+msgstr "serialno missing in cert ID"
+
+#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
+#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
+#, c-format
+msgid "assuan_inquire failed: %s\n"
+msgstr "assuan_inquire failed: %s\n"
+
+#: dirmngr/server.c:1232
+#, c-format
+msgid "fetch_cert_by_url failed: %s\n"
+msgstr "fetch_cert_by_url failed: %s\n"
+
+#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
+#, c-format
+msgid "error sending data: %s\n"
+msgstr "error sending data: %s\n"
+
+#: dirmngr/server.c:1382
+#, c-format
+msgid "start_cert_fetch failed: %s\n"
+msgstr "start_cert_fetch failed: %s\n"
+
+#: dirmngr/server.c:1415
+#, c-format
+msgid "fetch_next_cert failed: %s\n"
+msgstr "fetch_next_cert failed: %s\n"
+
+#: dirmngr/server.c:1442
+#, c-format
+msgid "max_replies %d exceeded\n"
+msgstr "max_replies %d exceeded\n"
+
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
+#, c-format
+msgid "can't allocate control structure: %s\n"
+msgstr "can't allocate control structure: %s\n"
+
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "failed to allocate assuan context: %s\n"
+
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
+#, c-format
+msgid "failed to initialize the server: %s\n"
+msgstr "failed to initialize the server: %s\n"
+
- #: dirmngr/server.c:2444
++#: dirmngr/server.c:2406
+#, 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:2475
++#: dirmngr/server.c:2437
+#, c-format
+msgid "Assuan accept problem: %s\n"
+msgstr "Assuan accept problem: %s\n"
+
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
+#, c-format
+msgid "Assuan processing failed: %s\n"
+msgstr "Assuan processing failed: %s\n"
+
+#: dirmngr/validate.c:201
+msgid "accepting root CA not marked as a CA"
+msgstr "accepting root CA not marked as a CA"
+
+#: dirmngr/validate.c:227
+msgid "CRL checking too deeply nested\n"
+msgstr "CRL checking too deeply nested\n"
+
+#: dirmngr/validate.c:245
+msgid "not checking CRL for"
+msgstr "not checking CRL for"
+
+#: dirmngr/validate.c:250
+msgid "checking CRL for"
+msgstr "checking CRL for"
+
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr "running in compatibility mode - certificate chain not checked!\n"
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
+msgid "selfsigned certificate has a BAD signature"
+msgstr "selfsigned certificate has a BAD signature"
+
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
+#, c-format
+msgid "checking trustworthiness of root certificate failed: %s\n"
+msgstr "checking trustworthiness of root certificate failed: %s\n"
+
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
+msgid "certificate chain is good\n"
+msgstr "certificate chain is good\n"
+
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA requires the use of a 160 bit hash algorithm\n"
+
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
+msgid "certificate should not have been used for CRL signing\n"
+msgstr "certificate should not have been used for CRL signing\n"
+
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
+msgid "quiet"
+msgstr "quiet"
+
+#: tools/gpg-connect-agent.c:79
+msgid "print data out hex encoded"
+msgstr "print data out hex encoded"
+
+#: tools/gpg-connect-agent.c:80
+msgid "decode received data lines"
+msgstr "decode received data lines"
+
+#: tools/gpg-connect-agent.c:81
+msgid "connect to the dirmngr"
+msgstr "connect to the dirmngr"
+
+#: tools/gpg-connect-agent.c:84
+msgid "|NAME|connect to Assuan socket NAME"
+msgstr "|NAME|connect to Assuan socket NAME"
+
+#: tools/gpg-connect-agent.c:86
+msgid "|ADDR|connect to Assuan server at ADDR"
+msgstr "|ADDR|connect to Assuan server at ADDR"
+
+#: tools/gpg-connect-agent.c:88
+msgid "run the Assuan server given on the command line"
+msgstr "run the Assuan server given on the command line"
+
+#: tools/gpg-connect-agent.c:90
+msgid "do not use extended connect mode"
+msgstr "do not use extended connect mode"
+
+#: tools/gpg-connect-agent.c:92
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|FILE|run commands from FILE on startup"
+
+#: tools/gpg-connect-agent.c:93
+msgid "run /subst on startup"
+msgstr "run /subst on startup"
+
+#: tools/gpg-connect-agent.c:205
+msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
+msgstr "Usage: @GPG at -connect-agent [options] (-h for help)"
+
+#: tools/gpg-connect-agent.c:208
+msgid ""
+"Syntax: @GPG at -connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+"Syntax: @GPG at -connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+
+#: tools/gpg-connect-agent.c:1247
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr "option “[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:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
+#: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
+msgid "Options controlling the diagnostic output"
+msgstr "Options controlling the diagnostic output"
+
+#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
+#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
+msgid "Options controlling the configuration"
+msgstr "Options controlling the configuration"
+
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
+#: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
+msgid "Options useful for debugging"
+msgstr "Options useful for debugging"
+
+#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
+msgid "Options controlling the security"
+msgstr "Options controlling the security"
+
+#: tools/gpgconf-comp.c:528
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|expire SSH keys after N seconds"
+
+#: tools/gpgconf-comp.c:532
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|set maximum PIN cache lifetime to N seconds"
+
+#: tools/gpgconf-comp.c:536
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|set maximum SSH key lifetime to N seconds"
+
+#: tools/gpgconf-comp.c:560
+msgid "Options enforcing a passphrase policy"
+msgstr "Options enforcing a passphrase policy"
+
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
- msgstr "do not allow to bypass the passphrase policy"
++msgid "do not allow bypassing the passphrase policy"
++msgstr "do not allow bypassing the passphrase policy"
+
+#: tools/gpgconf-comp.c:567
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr "|N|set minimal required length for new passphrases to N"
+
+#: tools/gpgconf-comp.c:571
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr "|N|require at least N non-alpha characters for a new passphrase"
+
+#: tools/gpgconf-comp.c:575
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|check new passphrases against pattern in FILE"
+
+#: tools/gpgconf-comp.c:579
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|expire the passphrase after N days"
+
+#: tools/gpgconf-comp.c:583
+msgid "do not allow the reuse of old passphrases"
+msgstr "do not allow the reuse of old passphrases"
+
+#: tools/gpgconf-comp.c:587
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|set the Pinentry timeout to N seconds"
+
+#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|use NAME as default secret key"
+
+#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|encrypt to user ID NAME as well"
+
+#: tools/gpgconf-comp.c:704
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|set up email aliases"
+
+#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
+msgid "Configuration for Keyservers"
+msgstr "Configuration for Keyservers"
+
+#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|use keyserver at URL"
+
+#: tools/gpgconf-comp.c:735
+msgid "allow PKA lookups (DNS requests)"
+msgstr "allow PKA lookups (DNS requests)"
+
+#: tools/gpgconf-comp.c:738
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+
+#: tools/gpgconf-comp.c:787
+msgid "disable all access to the dirmngr"
+msgstr "disable all access to the dirmngr"
+
+#: tools/gpgconf-comp.c:790
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
+
+#: tools/gpgconf-comp.c:820
+msgid "do not check CRLs for root certificates"
+msgstr "do not check CRLs for root certificates"
+
+#: tools/gpgconf-comp.c:869
+msgid "Options controlling the format of the output"
+msgstr "Options controlling the format of the output"
+
+#: tools/gpgconf-comp.c:905
+msgid "Options controlling the interactivity and enforcement"
+msgstr "Options controlling the interactivity and enforcement"
+
+#: tools/gpgconf-comp.c:915
+msgid "Options controlling the use of Tor"
+msgstr "Options controlling the use of Tor"
+
+#: tools/gpgconf-comp.c:929
+msgid "Configuration for HTTP servers"
+msgstr "Configuration for HTTP servers"
+
+#: tools/gpgconf-comp.c:940
+msgid "use system's HTTP proxy setting"
+msgstr "use system's HTTP proxy setting"
+
+#: tools/gpgconf-comp.c:945
+msgid "Configuration of LDAP servers to use"
+msgstr "Configuration of LDAP servers to use"
+
+#: tools/gpgconf-comp.c:974
+msgid "LDAP server list"
+msgstr "LDAP server list"
+
+#: tools/gpgconf-comp.c:982
+msgid "Configuration for OCSP"
+msgstr "Configuration for OCSP"
+
+#: tools/gpgconf-comp.c:1063
+msgid "GPG for OpenPGP"
+msgstr "GPG for OpenPGP"
+
+#: tools/gpgconf-comp.c:1064
+msgid "GPG Agent"
+msgstr "GPG Agent"
+
+#: tools/gpgconf-comp.c:1065
+msgid "Smartcard Daemon"
+msgstr "Smartcard Daemon"
+
+#: tools/gpgconf-comp.c:1066
+msgid "GPG for S/MIME"
+msgstr "GPG for S/MIME"
+
+#: tools/gpgconf-comp.c:1067
+msgid "Key Acquirer"
+msgstr "Key Acquirer"
+
+#: tools/gpgconf-comp.c:1068
+msgid "PIN and Passphrase Entry"
+msgstr "PIN and Passphrase Entry"
+
+#: tools/gpgconf-comp.c:1182
+msgid "Component not suitable for launching"
+msgstr "Component not suitable for launching"
+
+#: tools/gpgconf-comp.c:3240
+#, c-format
+msgid "External verification of component %s failed"
+msgstr "External verification of component %s failed"
+
+#: tools/gpgconf-comp.c:3391
+msgid "Note that group specifications are ignored\n"
+msgstr "Note that group specifications are ignored\n"
+
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
+msgid "list all components"
+msgstr "list all components"
+
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
+msgid "check all programs"
+msgstr "check all programs"
+
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
+msgid "|COMPONENT|list options"
+msgstr "|COMPONENT|list options"
+
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
+msgid "|COMPONENT|change options"
+msgstr "|COMPONENT|change options"
+
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
+msgid "|COMPONENT|check options"
+msgstr "|COMPONENT|check options"
+
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
+msgid "apply global default values"
+msgstr "apply global default values"
+
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
+msgid "get the configuration directories for @GPGCONF@"
+msgstr "get the configuration directories for @GPGCONF@"
+
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
+msgid "list global configuration file"
+msgstr "list global configuration file"
+
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
+msgid "check global configuration file"
+msgstr "check global configuration file"
+
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
+msgid "reload all or a given component"
+msgstr "reload all or a given component"
+
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
+msgid "launch a given component"
+msgstr "launch a given component"
+
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
+msgid "kill a given component"
+msgstr "kill a given component"
+
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
+msgid "use as output file"
+msgstr "use as output file"
+
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
+msgid "activate changes at runtime, if possible"
+msgstr "activate changes at runtime, if possible"
+
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
+msgid "Usage: @GPGCONF@ [options] (-h for help)"
+msgstr "Usage: @GPGCONF@ [options] (-h for help)"
+
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
+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:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
+msgid "Need one component argument"
+msgstr "Need one component argument"
+
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
+msgid "Component not found"
+msgstr "Component not found"
+
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
+msgid "No argument allowed"
+msgstr "No argument allowed"
+
+#: tools/symcryptrun.c:154
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@\n"
+"Commands:\n"
+" "
+
+#: tools/symcryptrun.c:156
+msgid "decryption modus"
+msgstr "decryption modus"
+
+#: tools/symcryptrun.c:157
+msgid "encryption modus"
+msgstr "encryption modus"
+
+#: tools/symcryptrun.c:161
+msgid "tool class (confucius)"
+msgstr "tool class (confucius)"
+
+#: tools/symcryptrun.c:162
+msgid "program filename"
+msgstr "program filename"
+
+#: tools/symcryptrun.c:164
+msgid "secret key file (required)"
+msgstr "secret key file (required)"
+
+#: tools/symcryptrun.c:165
+msgid "input file name (default stdin)"
+msgstr "input file name (default stdin)"
+
+#: tools/symcryptrun.c:209
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Usage: symcryptrun [options] (-h for help)"
+
+#: tools/symcryptrun.c:212
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
+#, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s on %s aborted with status %i\n"
+
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
+#, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "%s on %s failed with status %i\n"
+
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
+#, c-format
+msgid "can't create temporary directory '%s': %s\n"
+msgstr "can't create temporary directory '%s': %s\n"
+
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
+#, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "could not open %s for writing: %s\n"
+
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
+#, c-format
+msgid "error writing to %s: %s\n"
+msgstr "error writing to %s: %s\n"
+
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
+#, c-format
+msgid "error reading from %s: %s\n"
+msgstr "error reading from %s: %s\n"
+
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
+#, c-format
+msgid "error closing %s: %s\n"
+msgstr "error closing %s: %s\n"
+
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
+msgid "no --program option provided\n"
+msgstr "no --program option provided\n"
+
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr "only --decrypt and --encrypt are supported\n"
+
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
+msgid "no --keyfile option provided\n"
+msgstr "no --keyfile option provided\n"
+
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
+msgid "cannot allocate args vector\n"
+msgstr "cannot allocate args vector\n"
+
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
+#, c-format
+msgid "could not create pipe: %s\n"
+msgstr "could not create pipe: %s\n"
+
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
+#, c-format
+msgid "could not create pty: %s\n"
+msgstr "could not create pty: %s\n"
+
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
+#, c-format
+msgid "could not fork: %s\n"
+msgstr "could not fork: %s\n"
+
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
+#, c-format
+msgid "execv failed: %s\n"
+msgstr "execv failed: %s\n"
+
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
+#, c-format
+msgid "select failed: %s\n"
+msgstr "select failed: %s\n"
+
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
+#, c-format
+msgid "read failed: %s\n"
+msgstr "read failed: %s\n"
+
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
+#, c-format
+msgid "pty read failed: %s\n"
+msgstr "pty read failed: %s\n"
+
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
+#, c-format
+msgid "waitpid failed: %s\n"
+msgstr "waitpid failed: %s\n"
+
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr "child aborted with status %i\n"
+
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
+#, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "cannot allocate infile string: %s\n"
+
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
+#, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "cannot allocate outfile string: %s\n"
+
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr "either %s or %s must be given\n"
+
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
+msgid "no class provided\n"
+msgstr "no class provided\n"
+
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
+#, c-format
+msgid "class %s is not supported\n"
+msgstr "class %s is not supported\n"
+
+#: tools/gpg-check-pattern.c:144
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+
+#: tools/gpg-check-pattern.c:147
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
diff --cc po/en at quot.po
index 4794a5a,0000000..1f9f420
mode 100644,000000..100644
--- a/po/en at quot.po
+++ b/po/en at quot.po
@@@ -1,10623 -1,0 +1,10548 @@@
+# English translations for GNU gnupg package.
+# Copyright (C) 2016 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU gnupg package.
+# Automatically generated, 2016.
+#
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+msgid ""
+msgstr ""
- "Project-Id-Version: GNU gnupg 2.1.14\n"
++"Project-Id-Version: GNU gnupg 2.1.15\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
- "PO-Revision-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"PO-Revision-Date: 2016-08-18 17:17+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: agent/call-pinentry.c:257
+#, 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:447
+msgid "|pinentry-label|_OK"
+msgstr "|pinentry-label|_OK"
+
+#: agent/call-pinentry.c:448
+msgid "|pinentry-label|_Cancel"
+msgstr "|pinentry-label|_Cancel"
+
+#: agent/call-pinentry.c:449
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_Yes"
+
+#: agent/call-pinentry.c:450
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_No"
+
+#: agent/call-pinentry.c:451
+msgid "|pinentry-label|PIN:"
+msgstr "|pinentry-label|PIN:"
+
+#: agent/call-pinentry.c:452
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|_Save in password manager"
+
+#: agent/call-pinentry.c:453
+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:455
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr "|pinentry-tt|Make passphrase visible"
+
+#: agent/call-pinentry.c:456
+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:736
+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:758
+msgid "pinentry.qualitybar.tooltip"
+msgstr "pinentry.qualitybar.tooltip"
+
+#: agent/call-pinentry.c:868
+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:871
+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:909 agent/call-pinentry.c:1093
+msgid "PIN:"
+msgstr "PIN:"
+
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
+msgid "Passphrase:"
+msgstr "Passphrase:"
+
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
+msgid "does not match - try again"
+msgstr "does not match - try again"
+
+#. TRANSLATORS: The string is appended to an error message in
+#. the pinentry. The %s is the actual error message, the
+#. two %d give the current and maximum number of tries.
+#: agent/call-pinentry.c:959
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr "SETERROR %s (try %d of %d)"
+
+#: agent/call-pinentry.c:971
+msgid "Repeat:"
+msgstr "Repeat:"
+
+#: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
+msgid "PIN too long"
+msgstr "PIN too long"
+
+#: agent/call-pinentry.c:1002
+msgid "Passphrase too long"
+msgstr "Passphrase too long"
+
+#: agent/call-pinentry.c:1010
+msgid "Invalid characters in PIN"
+msgstr "Invalid characters in PIN"
+
+#: agent/call-pinentry.c:1015
+msgid "PIN too short"
+msgstr "PIN too short"
+
+#: agent/call-pinentry.c:1028
+msgid "Bad PIN"
+msgstr "Bad PIN"
+
+#: agent/call-pinentry.c:1028
+msgid "Bad Passphrase"
+msgstr "Bad Passphrase"
+
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
+#, c-format
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "ssh keys greater than %d bits are not supported\n"
+
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
+#, c-format
+msgid "can't create '%s': %s\n"
+msgstr "can't create '%s': %s\n"
+
- #: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
+#, c-format
+msgid "can't open '%s': %s\n"
+msgstr "can't open '%s': %s\n"
+
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "error getting serial number of card: %s\n"
+
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
+#, c-format
+msgid "detected card with S/N: %s\n"
+msgstr "detected card with S/N: %s\n"
+
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
+#, c-format
+msgid "no authentication key for ssh on card: %s\n"
+msgstr "no authentication key for ssh on card: %s\n"
+
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
+#, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "no suitable card key found: %s\n"
+
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
+#, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "shadowing the key failed: %s\n"
+
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
+#, c-format
+msgid "error writing key: %s\n"
+msgstr "error writing key: %s\n"
+
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
+#, 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:2919
++#: agent/command-ssh.c:2746
+msgid "Allow"
+msgstr "Allow"
+
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
+msgid "Deny"
+msgstr "Deny"
+
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
+#, 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:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
+msgid "Please re-enter this passphrase"
+msgstr "Please re-enter this passphrase"
+
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
+#, 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:3712
++#: agent/command-ssh.c:3541
+#, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "failed to create stream from socket: %s\n"
+
+#: agent/divert-scd.c:92 g10/call-agent.c:1268
+msgid "Please insert the card with serial number"
+msgstr "Please insert the card with serial number"
+
+#: agent/divert-scd.c:93 g10/call-agent.c:1269
+msgid "Please remove the current card and insert the one with serial number"
+msgstr "Please remove the current card and insert the one with serial number"
+
+#: agent/divert-scd.c:204
+msgid "Admin PIN"
+msgstr "Admin PIN"
+
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:209
+msgid "PUK"
+msgstr "PUK"
+
+#: agent/divert-scd.c:216
+msgid "Reset Code"
+msgstr "Reset Code"
+
+#: agent/divert-scd.c:242
+#, c-format
+msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgstr "%s%%0A%%0AUse the reader's pinpad for input."
+
+#: agent/divert-scd.c:291
+msgid "Repeat this Reset Code"
+msgstr "Repeat this Reset Code"
+
+#: agent/divert-scd.c:293
+msgid "Repeat this PUK"
+msgstr "Repeat this PUK"
+
+#: agent/divert-scd.c:294
+msgid "Repeat this PIN"
+msgstr "Repeat this PIN"
+
+#: agent/divert-scd.c:299
+msgid "Reset Code not correctly repeated; try again"
+msgstr "Reset Code not correctly repeated; try again"
+
+#: agent/divert-scd.c:301
+msgid "PUK not correctly repeated; try again"
+msgstr "PUK not correctly repeated; try again"
+
+#: agent/divert-scd.c:302
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN not correctly repeated; try again"
+
+#: agent/divert-scd.c:314
+#, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr "Please enter the PIN%s%s%s to unlock the card"
+
+#: agent/genkey.c:110 sm/certreqgen-ui.c:394
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "error creating temporary file: %s\n"
+
+#: agent/genkey.c:117
+#, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "error writing to temporary file: %s\n"
+
+#: agent/genkey.c:158 agent/genkey.c:164
+msgid "Enter new passphrase"
+msgstr "Enter new passphrase"
+
+#: agent/genkey.c:172
+msgid "Take this one anyway"
+msgstr "Take this one anyway"
+
+#: agent/genkey.c:202
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+
+#: agent/genkey.c:204
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+
+#: agent/genkey.c:216
+msgid "Yes, protection is not needed"
+msgstr "Yes, protection is not needed"
+
+#: agent/genkey.c:233
+#, c-format
+msgid "A passphrase should be at least %u character long."
+msgid_plural "A passphrase should be at least %u characters long."
+msgstr[0] "A passphrase should be at least %u character long."
+msgstr[1] "A passphrase should be at least %u characters long."
+
+#: agent/genkey.c:252
+#, c-format
+msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
+msgid_plural ""
+"A passphrase should contain at least %u digits or%%0Aspecial characters."
+msgstr[0] ""
+"A passphrase should contain at least %u digit or%%0Aspecial character."
+msgstr[1] ""
+"A passphrase should contain at least %u digits or%%0Aspecial characters."
+
+#: agent/genkey.c:278
+#, c-format
+msgid "A passphrase may not be a known term or match%%0Acertain pattern."
+msgstr "A passphrase may not be a known term or match%%0Acertain pattern."
+
+#: agent/genkey.c:293
+msgid "Warning: You have entered an insecure passphrase."
+msgstr "Warning: You have entered an insecure passphrase."
+
+#: agent/genkey.c:480
+#, c-format
+msgid "Please enter the passphrase to%0Aprotect your new key"
+msgstr "Please enter the passphrase to%0Aprotect your new key"
+
+#: agent/genkey.c:606
+msgid "Please enter the new passphrase"
+msgstr "Please enter the new passphrase"
+
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Options:\n"
+" "
+
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
+msgid "run in daemon mode (background)"
+msgstr "run in daemon mode (background)"
+
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
+msgid "run in server mode (foreground)"
+msgstr "run in server mode (foreground)"
+
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
+msgid "verbose"
+msgstr "verbose"
+
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
+msgid "be somewhat more quiet"
+msgstr "be somewhat more quiet"
+
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
+msgid "sh-style command output"
+msgstr "sh-style command output"
+
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
+msgid "csh-style command output"
+msgstr "csh-style command output"
+
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
+msgid "|FILE|read options from FILE"
+msgstr "|FILE|read options from FILE"
+
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
+msgid "do not detach from the console"
+msgstr "do not detach from the console"
+
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
+msgid "do not grab keyboard and mouse"
+msgstr "do not grab keyboard and mouse"
+
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
+msgid "use a log file for the server"
+msgstr "use a log file for the server"
+
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|use PGM as the PIN-Entry program"
+
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|use PGM as the SCdaemon program"
+
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
+msgid "do not use the SCdaemon"
+msgstr "do not use the SCdaemon"
+
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
+msgid "|NAME|accept some commands via NAME"
+msgstr "|NAME|accept some commands via NAME"
+
- #: agent/gpg-agent.c:197
++#: agent/gpg-agent.c:196
+msgid "ignore requests to change the TTY"
+msgstr "ignore requests to change the TTY"
+
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
+msgid "ignore requests to change the X display"
+msgstr "ignore requests to change the X display"
+
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
+msgid "|N|expire cached PINs after N seconds"
+msgstr "|N|expire cached PINs after N seconds"
+
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
+msgid "do not use the PIN cache when signing"
+msgstr "do not use the PIN cache when signing"
+
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
+msgid "disallow the use of an external password cache"
+msgstr "disallow the use of an external password cache"
+
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
+msgid "disallow clients to mark keys as \"trusted\""
+msgstr "disallow clients to mark keys as “trusted”"
+
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
+msgid "allow presetting passphrase"
+msgstr "allow presetting passphrase"
+
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
+msgid "disallow caller to override the pinentry"
+msgstr "disallow caller to override the pinentry"
+
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
+msgid "allow passphrase to be prompted through Emacs"
+msgstr "allow passphrase to be prompted through Emacs"
+
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
+msgid "enable ssh support"
+msgstr "enable ssh support"
+
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
+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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
+msgid "Please report bugs to <@EMAIL@>.\n"
+msgstr "Please report bugs to <@EMAIL@>.\n"
+
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
+msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
+msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
+
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
+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:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
+#, c-format
+msgid "invalid debug-level '%s' given\n"
+msgstr "invalid debug-level ‘%s’ given\n"
+
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr "%s is too old (need %s, have %s)\n"
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Note: no default option file ‘%s’\n"
+
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "option file '%s': %s\n"
+
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
+#, c-format
+msgid "reading options from '%s'\n"
+msgstr "reading options from ‘%s’\n"
+
- #: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
+#, c-format
+msgid "Note: '%s' is not considered an option\n"
+msgstr "Note: ‘%s’ is not considered an option\n"
+
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
+#, c-format
+msgid "can't create socket: %s\n"
+msgstr "can't create socket: %s\n"
+
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
+#, c-format
+msgid "socket name '%s' is too long\n"
+msgstr "socket name ‘%s’ is too long\n"
+
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
+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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
+msgid "error getting nonce for the socket\n"
+msgstr "error getting nonce for the socket\n"
+
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
+#, c-format
+msgid "error binding socket to '%s': %s\n"
+msgstr "error binding socket to '%s': %s\n"
+
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
+#, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "can't set permissions of '%s': %s\n"
+
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
+#, c-format
+msgid "listen() failed: %s\n"
+msgstr "listen() failed: %s\n"
+
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
+#, c-format
+msgid "listening on socket '%s'\n"
+msgstr "listening on socket ‘%s’\n"
+
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
+#, c-format
+msgid "can't create directory '%s': %s\n"
+msgstr "can't create directory '%s': %s\n"
+
- #: agent/gpg-agent.c:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
+#, c-format
+msgid "directory '%s' created\n"
+msgstr "directory ‘%s’ created\n"
+
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
+#, c-format
+msgid "stat() failed for '%s': %s\n"
+msgstr "stat() failed for '%s': %s\n"
+
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
+#, c-format
+msgid "can't use '%s' as home directory\n"
+msgstr "can't use ‘%s’ as home directory\n"
+
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
+#, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "error reading nonce on fd %d: %s\n"
+
+#: agent/gpg-agent.c:2307
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
+msgstr "handler 0x%lx for fd %d started\n"
+
+#: agent/gpg-agent.c:2312
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr "handler 0x%lx for fd %d terminated\n"
+
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
+#, 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:2390
++#: agent/gpg-agent.c:2392
+#, 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:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
+#, c-format
+msgid "npth_pselect failed: %s - waiting 1s\n"
+msgstr "npth_pselect failed: %s - waiting 1s\n"
+
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
+#, c-format
+msgid "%s %s stopped\n"
+msgstr "%s %s stopped\n"
+
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
+msgid "no gpg-agent running in this session\n"
+msgstr "no gpg-agent running in this session\n"
+
+#: agent/preset-passphrase.c:99
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+
+#: agent/preset-passphrase.c:102
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Commands:\n"
+" "
+
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Options:\n"
+" "
+
+#: agent/protect-tool.c:154
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Usage: gpg-protect-tool [options] (-h for help)\n"
+
+#: agent/protect-tool.c:156
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]\n"
+"Secret key maintenance tool\n"
+msgstr ""
+"Syntax: gpg-protect-tool [options] [args]\n"
+"Secret key maintenance tool\n"
+
- #: agent/protect-tool.c:700
++#: 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:705
++#: 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:711
++#: 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:716
++#: 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:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
+msgid "cancelled\n"
+msgstr "cancelled\n"
+
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
+#, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "error while asking for the passphrase: %s\n"
+
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
+#, 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:1453 agent/findkey.c:1467
+#: 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:252
+#, 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:268
+#, 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:282 agent/findkey.c:289
+msgid "Change passphrase"
+msgstr "Change passphrase"
+
+#: agent/findkey.c:290
+msgid "I'll change it later"
+msgstr "I'll change it later"
+
+#: agent/findkey.c:1429
+#, 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:1453 agent/findkey.c:1467
+msgid "Delete key"
+msgstr "Delete key"
+
+#: agent/findkey.c:1464
+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:204
+#, 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:512
+#, 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:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
+#, c-format
+msgid "error creating a pipe: %s\n"
+msgstr "error creating a pipe: %s\n"
+
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
+#, 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:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
+#, c-format
+msgid "error forking process: %s\n"
+msgstr "error forking process: %s\n"
+
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
+#, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "waiting for processes to terminate failed: %s\n"
+
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
+#, c-format
+msgid "error running '%s': probably not installed\n"
+msgstr "error running '%s': probably not installed\n"
+
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: 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:667
++#: common/exechelp-posix.c:665
+#, c-format
+msgid "error running '%s': terminated\n"
+msgstr "error running '%s': terminated\n"
+
+#: common/exechelp-w32.c:746 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/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/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
+#, c-format
+msgid "can't connect to '%s': %s\n"
+msgstr "can't connect to '%s': %s\n"
+
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "communication problem with gpg-agent\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
+msgid "problem setting the gpg-agent options\n"
+msgstr "problem setting the gpg-agent options\n"
+
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- msgid "canceled by user\n"
- msgstr "canceled by user\n"
-
- #: common/simple-pwquery.c:579
- msgid "problem with the agent\n"
- msgstr "problem with the agent\n"
-
- #: common/simple-pwquery.c:701
- #, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "problem with the agent (unexpected response “%s”)\n"
-
+#: common/sysutils.c:124
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "can't disable core dumps: %s\n"
+
+#: common/sysutils.c:219
+#, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "Warning: unsafe ownership on %s “%s”\n"
+
+#: common/sysutils.c:251
+#, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "Warning: unsafe permissions on %s “%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:789 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:490
++#: common/miscellaneous.c:554
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr "unknown debug flag ‘%s’ ignored\n"
+
+#: common/asshelp.c:417
+#, c-format
+msgid "no running gpg-agent - starting '%s'\n"
+msgstr "no running gpg-agent - starting ‘%s’\n"
+
+#: common/asshelp.c:477
+#, 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:485
+msgid "connection to agent established\n"
+msgstr "connection to agent established\n"
+
+#: common/asshelp.c:525
+msgid "connection to agent is in restricted mode\n"
+msgstr "connection to agent is in restricted mode\n"
+
- #: common/asshelp.c:606
++#: common/asshelp.c:582
+#, c-format
+msgid "no running Dirmngr - starting '%s'\n"
+msgstr "no running Dirmngr - starting ‘%s’\n"
+
- #: common/asshelp.c:663
++#: common/asshelp.c:630
+#, 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:672
++#: common/asshelp.c:639
+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:2885
+#, 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:991
+msgid "no CRL found for certificate"
+msgstr "no CRL found for certificate"
+
+#: common/audit.c:1114 sm/certchain.c:1001
+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:893
+msgid "[none]"
+msgstr "[none]"
+
+#: common/argparse.c:365
+msgid "argument not expected"
+msgstr "argument not expected"
+
+#: common/argparse.c:367
+msgid "read error"
+msgstr "read error"
+
+#: common/argparse.c:369
+msgid "keyword too long"
+msgstr "keyword too long"
+
+#: common/argparse.c:371
+msgid "missing argument"
+msgstr "missing argument"
+
+#: common/argparse.c:373
+msgid "invalid argument"
+msgstr "invalid argument"
+
+#: common/argparse.c:375
+msgid "invalid command"
+msgstr "invalid command"
+
+#: common/argparse.c:377
+msgid "invalid alias definition"
+msgstr "invalid alias definition"
+
+#: common/argparse.c:379
+msgid "out of core"
+msgstr "out of core"
+
+#: common/argparse.c:381
+msgid "invalid option"
+msgstr "invalid option"
+
+#: common/argparse.c:389
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr "missing argument for option “%.50s”\n"
+
+#: common/argparse.c:391
+#, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "invalid argument for option “%.50s”\n"
+
+#: common/argparse.c:393
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr "option “%.50s” does not expect an argument\n"
+
+#: common/argparse.c:395
+#, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "invalid command “%.50s”\n"
+
+#: common/argparse.c:397
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr "option “%.50s” is ambiguous\n"
+
+#: common/argparse.c:399
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr "command “%.50s” is ambiguous\n"
+
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
+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:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
++#, c-format
++msgid "%s is too old (need %s, have %s)\n"
++msgstr "%s is too old (need %s, have %s)\n"
++
+#: g10/armor.c:424
+#, c-format
+msgid "armor: %s\n"
+msgstr "armor: %s\n"
+
+#: g10/armor.c:463
+msgid "invalid armor header: "
+msgstr "invalid armor header: "
+
+#: g10/armor.c:474
+msgid "armor header: "
+msgstr "armor header: "
+
+#: g10/armor.c:487
+msgid "invalid clearsig header\n"
+msgstr "invalid clearsig header\n"
+
+#: g10/armor.c:500
+msgid "unknown armor header: "
+msgstr "unknown armor header: "
+
+#: g10/armor.c:553
+msgid "nested clear text signatures\n"
+msgstr "nested clear text signatures\n"
+
+#: g10/armor.c:688
+msgid "unexpected armor: "
+msgstr "unexpected armor: "
+
+#: g10/armor.c:701
+msgid "invalid dash escaped line: "
+msgstr "invalid dash escaped line: "
+
+#: g10/armor.c:873 g10/armor.c:1490
+#, c-format
+msgid "invalid radix64 character %02X skipped\n"
+msgstr "invalid radix64 character %02X skipped\n"
+
+#: g10/armor.c:916
+msgid "premature eof (no CRC)\n"
+msgstr "premature eof (no CRC)\n"
+
+#: g10/armor.c:950
+msgid "premature eof (in CRC)\n"
+msgstr "premature eof (in CRC)\n"
+
+#: g10/armor.c:958
+msgid "malformed CRC\n"
+msgstr "malformed CRC\n"
+
+#: g10/armor.c:962 g10/armor.c:1527
+#, c-format
+msgid "CRC error; %06lX - %06lX\n"
+msgstr "CRC error; %06lX - %06lX\n"
+
+#: g10/armor.c:982
+msgid "premature eof (in trailer)\n"
+msgstr "premature eof (in trailer)\n"
+
+#: g10/armor.c:986
+msgid "error in trailer line\n"
+msgstr "error in trailer line\n"
+
+#: g10/armor.c:1303
+msgid "no valid OpenPGP data found.\n"
+msgstr "no valid OpenPGP data found.\n"
+
+#: g10/armor.c:1308
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "invalid armor: line longer than %d characters\n"
+
+#: g10/armor.c:1312
+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:1115
+#, c-format
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "[ not human readable (%zu bytes: %s%s) ]"
+
+#: g10/build-packet.c:1167
+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:1179 g10/build-packet.c:1275
+msgid "a user notation name must contain the '@' character\n"
+msgstr "a user notation name must contain the ‘@’ character\n"
+
+#: g10/build-packet.c:1185 g10/build-packet.c:1281
+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:1203
+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:1259
+msgid "a notation name may not contain an '=' character\n"
+msgstr "a notation name may not contain an ‘=’ character\n"
+
+#: g10/build-packet.c:1265
+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:1324 g10/build-packet.c:1335
+msgid "WARNING: invalid notation data found\n"
+msgstr "WARNING: invalid notation data found\n"
+
+#: g10/call-agent.c:151 sm/call-agent.c:199
+#, c-format
+msgid "failed to proxy %s inquiry to client\n"
+msgstr "failed to proxy %s inquiry to client\n"
+
+#: g10/call-agent.c:176
+msgid "Enter passphrase: "
+msgstr "Enter passphrase: "
+
+#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
+#, c-format
+msgid "error getting version from '%s': %s\n"
+msgstr "error getting version from '%s': %s\n"
+
+#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
+#, c-format
+msgid "server '%s' is older than us (%s < %s)"
+msgstr "server ‘%s’ is older than us (%s < %s)"
+
+#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
+#, c-format
+msgid "WARNING: %s\n"
+msgstr "WARNING: %s\n"
+
+#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
+#: g10/keygen.c:4883
+#, 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:1694
+#, 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:1891 g10/delkey.c:128 g10/keyedit.c:2018
+#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
+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:2259
+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:1457 g10/card-util.c:1570
+#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
+msgid "Your selection? "
+msgstr "Your selection? "
+
+#: g10/card-util.c:279 g10/card-util.c:330
+msgid "[not set]"
+msgstr "[not set]"
+
+#: g10/card-util.c:533
+msgid "male"
+msgstr "male"
+
+#: g10/card-util.c:534
+msgid "female"
+msgstr "female"
+
+#: g10/card-util.c:534
+msgid "unspecified"
+msgstr "unspecified"
+
+#: g10/card-util.c:561
+msgid "not forced"
+msgstr "not forced"
+
+#: g10/card-util.c:561
+msgid "forced"
+msgstr "forced"
+
+#: g10/card-util.c:636
+msgid "Error: Only plain ASCII is currently allowed.\n"
+msgstr "Error: Only plain ASCII is currently allowed.\n"
+
+#: g10/card-util.c:638
+msgid "Error: The \"<\" character may not be used.\n"
+msgstr "Error: The “<” character may not be used.\n"
+
+#: g10/card-util.c:640
+msgid "Error: Double spaces are not allowed.\n"
+msgstr "Error: Double spaces are not allowed.\n"
+
+#: g10/card-util.c:657
+msgid "Cardholder's surname: "
+msgstr "Cardholder's surname: "
+
+#: g10/card-util.c:659
+msgid "Cardholder's given name: "
+msgstr "Cardholder's given name: "
+
+#: g10/card-util.c:677
+#, 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:698
+msgid "URL to retrieve public key: "
+msgstr "URL to retrieve public key: "
+
+#: g10/card-util.c:706
+#, c-format
+msgid "Error: URL too long (limit is %d characters).\n"
+msgstr "Error: URL too long (limit is %d characters).\n"
+
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
+#, c-format
+msgid "error reading '%s': %s\n"
+msgstr "error reading '%s': %s\n"
+
+#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
+#, c-format
+msgid "error writing '%s': %s\n"
+msgstr "error writing '%s': %s\n"
+
+#: g10/card-util.c:861
+msgid "Login data (account name): "
+msgstr "Login data (account name): "
+
+#: g10/card-util.c:871
+#, c-format
+msgid "Error: Login data too long (limit is %d characters).\n"
+msgstr "Error: Login data too long (limit is %d characters).\n"
+
+#: g10/card-util.c:907
+msgid "Private DO data: "
+msgstr "Private DO data: "
+
+#: g10/card-util.c:917
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr "Error: Private DO too long (limit is %d characters).\n"
+
+#: g10/card-util.c:1000
+msgid "Language preferences: "
+msgstr "Language preferences: "
+
+#: g10/card-util.c:1008
+msgid "Error: invalid length of preference string.\n"
+msgstr "Error: invalid length of preference string.\n"
+
+#: g10/card-util.c:1017
+msgid "Error: invalid characters in preference string.\n"
+msgstr "Error: invalid characters in preference string.\n"
+
+#: g10/card-util.c:1039
+msgid "Sex ((M)ale, (F)emale or space): "
+msgstr "Sex ((M)ale, (F)emale or space): "
+
+#: g10/card-util.c:1053
+msgid "Error: invalid response.\n"
+msgstr "Error: invalid response.\n"
+
+#: g10/card-util.c:1075
+msgid "CA fingerprint: "
+msgstr "CA fingerprint: "
+
+#: g10/card-util.c:1098
+msgid "Error: invalid formatted fingerprint.\n"
+msgstr "Error: invalid formatted fingerprint.\n"
+
+#: g10/card-util.c:1148
+#, c-format
+msgid "key operation not possible: %s\n"
+msgstr "key operation not possible: %s\n"
+
+#: g10/card-util.c:1149
+msgid "not an OpenPGP card"
+msgstr "not an OpenPGP card"
+
+#: g10/card-util.c:1162
+#, c-format
+msgid "error getting current key info: %s\n"
+msgstr "error getting current key info: %s\n"
+
+#: g10/card-util.c:1249
+msgid "Replace existing key? (y/N) "
+msgstr "Replace existing key? (y/N) "
+
+#: g10/card-util.c:1266
+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:1291
+#, 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:1293
+#, 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:1294
+#, 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:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "rounded up to %u bits\n"
+
+#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr "%s keysizes must be in the range %u-%u\n"
+
+#: g10/card-util.c:1318
+#, 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:1338
+#, 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:1362
+msgid "Make off-card backup of encryption key? (Y/n) "
+msgstr "Make off-card backup of encryption key? (Y/n) "
+
+#: g10/card-util.c:1376
+msgid "Note: keys are already stored on the card!\n"
+msgstr "Note: keys are already stored on the card!\n"
+
+#: g10/card-util.c:1379
+msgid "Replace existing keys? (y/N) "
+msgstr "Replace existing keys? (y/N) "
+
+#: g10/card-util.c:1391
+#, 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:1448
+msgid "Please select the type of key to generate:\n"
+msgstr "Please select the type of key to generate:\n"
+
+#: g10/card-util.c:1450 g10/card-util.c:1561
+msgid " (1) Signature key\n"
+msgstr " (1) Signature key\n"
+
+#: g10/card-util.c:1451 g10/card-util.c:1563
+msgid " (2) Encryption key\n"
+msgstr " (2) Encryption key\n"
+
+#: g10/card-util.c:1452 g10/card-util.c:1565
+msgid " (3) Authentication key\n"
+msgstr " (3) Authentication key\n"
+
+#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
+msgid "Invalid selection.\n"
+msgstr "Invalid selection.\n"
+
+#: g10/card-util.c:1558
+msgid "Please select where to store the key:\n"
+msgstr "Please select where to store the key:\n"
+
+#: g10/card-util.c:1604
+#, c-format
+msgid "KEYTOCARD failed: %s\n"
+msgstr "KEYTOCARD failed: %s\n"
+
+#: g10/card-util.c:1700
+msgid "This command is not supported by this card\n"
+msgstr "This command is not supported by this card\n"
+
+#: g10/card-util.c:1705
+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:1708
+msgid "Continue? (y/N) "
+msgstr "Continue? (y/N) "
+
+#: g10/card-util.c:1713
+msgid "Really do a factory reset? (enter \"yes\") "
+msgstr "Really do a factory reset? (enter “yes”) "
+
+#: g10/card-util.c:1799 g10/keyedit.c:1856
+msgid "quit this menu"
+msgstr "quit this menu"
+
+#: g10/card-util.c:1801
+msgid "show admin commands"
+msgstr "show admin commands"
+
+#: g10/card-util.c:1802 g10/keyedit.c:1859
+msgid "show this help"
+msgstr "show this help"
+
+#: g10/card-util.c:1804
+msgid "list all available data"
+msgstr "list all available data"
+
+#: g10/card-util.c:1807
+msgid "change card holder's name"
+msgstr "change card holder's name"
+
+#: g10/card-util.c:1808
+msgid "change URL to retrieve key"
+msgstr "change URL to retrieve key"
+
+#: g10/card-util.c:1809
+msgid "fetch the key specified in the card URL"
+msgstr "fetch the key specified in the card URL"
+
+#: g10/card-util.c:1810
+msgid "change the login name"
+msgstr "change the login name"
+
+#: g10/card-util.c:1811
+msgid "change the language preferences"
+msgstr "change the language preferences"
+
+#: g10/card-util.c:1812
+msgid "change card holder's sex"
+msgstr "change card holder's sex"
+
+#: g10/card-util.c:1813
+msgid "change a CA fingerprint"
+msgstr "change a CA fingerprint"
+
+#: g10/card-util.c:1814
+msgid "toggle the signature force PIN flag"
+msgstr "toggle the signature force PIN flag"
+
+#: g10/card-util.c:1815
+msgid "generate new keys"
+msgstr "generate new keys"
+
+#: g10/card-util.c:1816
+msgid "menu to change or unblock the PIN"
+msgstr "menu to change or unblock the PIN"
+
+#: g10/card-util.c:1817
+msgid "verify the PIN and list all data"
+msgstr "verify the PIN and list all data"
+
+#: g10/card-util.c:1818
+msgid "unblock the PIN using a Reset Code"
+msgstr "unblock the PIN using a Reset Code"
+
+#: g10/card-util.c:1819
+msgid "destroy all keys and data"
+msgstr "destroy all keys and data"
+
+#: g10/card-util.c:1941
+msgid "gpg/card> "
+msgstr "gpg/card> "
+
+#: g10/card-util.c:1982
+msgid "Admin-only command\n"
+msgstr "Admin-only command\n"
+
+#: g10/card-util.c:2013
+msgid "Admin commands are allowed\n"
+msgstr "Admin commands are allowed\n"
+
+#: g10/card-util.c:2015
+msgid "Admin commands are not allowed\n"
+msgstr "Admin commands are not allowed\n"
+
+#: g10/card-util.c:2110 g10/keyedit.c:2805
+msgid "Invalid command (try \"help\")\n"
+msgstr "Invalid command (try “help”)\n"
+
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
+msgid "--output doesn't work for this command\n"
+msgstr "--output doesn't work for this command\n"
+
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
+#, c-format
+msgid "can't open '%s'\n"
+msgstr "can't open ‘%s’\n"
+
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
+#, c-format
+msgid "key \"%s\" not found: %s\n"
+msgstr "key “%s” not found: %s\n"
+
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "error reading keyblock: %s\n"
+
+#: g10/delkey.c:118 g10/getkey.c:579
+#, c-format
+msgid "key \"%s\" not found\n"
+msgstr "key “%s” not found\n"
+
+#: g10/delkey.c:129 g10/delkey.c:136
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(unless you specify the key by fingerprint)\n"
+
+#: g10/delkey.c:135
+msgid "can't do this in batch mode without \"--yes\"\n"
+msgstr "can't do this in batch mode without “--yes”\n"
+
+#: g10/delkey.c:148
+msgid "Delete this key from the keyring? (y/N) "
+msgstr "Delete this key from the keyring? (y/N) "
+
+#: g10/delkey.c:158
+msgid "This is a secret key! - really delete? (y/N) "
+msgstr "This is a secret key! - really delete? (y/N) "
+
+#: g10/delkey.c:201
+#, c-format
+msgid "deleting secret %s failed: %s\n"
+msgstr "deleting secret %s failed: %s\n"
+
+#: g10/delkey.c:203
+msgid "key"
+msgstr "key"
+
+#: g10/delkey.c:203
+msgid "subkey"
+msgstr "subkey"
+
+#: g10/delkey.c:226
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "deleting keyblock failed: %s\n"
+
+#: g10/delkey.c:239
+msgid "ownertrust information cleared\n"
+msgstr "ownertrust information cleared\n"
+
+#: g10/delkey.c:275
+#, c-format
+msgid "there is a secret key for public key \"%s\"!\n"
+msgstr "there is a secret key for public key “%s”!\n"
+
+#: g10/delkey.c:277
+msgid "use option \"--delete-secret-keys\" to delete it first.\n"
+msgstr "use option “--delete-secret-keys” to delete it first.\n"
+
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "error creating passphrase: %s\n"
+
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
+msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgstr "can't use a symmetric ESK packet due to the S2K mode\n"
+
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
+#, c-format
+msgid "using cipher %s\n"
+msgstr "using cipher %s\n"
+
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
+#, c-format
+msgid "'%s' already compressed\n"
+msgstr "‘%s’ already compressed\n"
+
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
+#, c-format
+msgid "WARNING: '%s' is an empty file\n"
+msgstr "WARNING: ‘%s’ is an empty file\n"
+
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
+#, c-format
+msgid "reading from '%s'\n"
+msgstr "reading from ‘%s’\n"
+
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
+#, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
+#, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
+msgstr ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
+
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s encrypted for: “%s”\n"
+
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "you may not use %s while in %s mode\n"
+
+#: g10/decrypt-data.c:93 g10/mainproc.c:304
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s encrypted data\n"
+
+#: g10/decrypt-data.c:96 g10/mainproc.c:308
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "encrypted with unknown algorithm %d\n"
+
+#: g10/decrypt-data.c:164 sm/decrypt.c:127
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+
+#: g10/decrypt-data.c:176
+msgid "problem handling encrypted packet\n"
+msgstr "problem handling encrypted packet\n"
+
+#: g10/exec.c:60
+msgid "no remote program execution supported\n"
+msgstr "no remote program execution supported\n"
+
+#: g10/exec.c:319
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"external program calls are disabled due to unsafe options file permissions\n"
+
+#: g10/exec.c:349
+msgid "this platform requires temporary files when calling external programs\n"
+msgstr ""
+"this platform requires temporary files when calling external programs\n"
+
+#: g10/exec.c:427
+#, c-format
+msgid "unable to execute program '%s': %s\n"
+msgstr "unable to execute program '%s': %s\n"
+
+#: g10/exec.c:430
+#, c-format
+msgid "unable to execute shell '%s': %s\n"
+msgstr "unable to execute shell '%s': %s\n"
+
+#: g10/exec.c:521
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "system error while calling external program: %s\n"
+
+#: g10/exec.c:532 g10/exec.c:599
+msgid "unnatural exit of external program\n"
+msgstr "unnatural exit of external program\n"
+
+#: g10/exec.c:547
+msgid "unable to execute external program\n"
+msgstr "unable to execute external program\n"
+
+#: g10/exec.c:564
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "unable to read external program response: %s\n"
+
+#: g10/exec.c:610 g10/exec.c:617
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
+msgstr "WARNING: unable to remove tempfile (%s) '%s': %s\n"
+
+#: g10/exec.c:622
+#, c-format
+msgid "WARNING: unable to remove temp directory '%s': %s\n"
+msgstr "WARNING: unable to remove temp directory '%s': %s\n"
+
+#: g10/export.c:102
+msgid "export signatures that are marked as local-only"
+msgstr "export signatures that are marked as local-only"
+
+#: g10/export.c:104
+msgid "export attribute user IDs (generally photo IDs)"
+msgstr "export attribute user IDs (generally photo IDs)"
+
+#: g10/export.c:106
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "export revocation keys marked as “sensitive”"
+
+#: g10/export.c:108
+msgid "remove unusable parts from key during export"
+msgstr "remove unusable parts from key during export"
+
+#: g10/export.c:110
+msgid "remove as much as possible from key during export"
+msgstr "remove as much as possible from key during export"
+
+#: g10/export.c:1204
+msgid " - skipped"
+msgstr " - skipped"
+
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
+#, c-format
+msgid "writing to '%s'\n"
+msgstr "writing to ‘%s’\n"
+
+#: g10/export.c:1660
+#, c-format
+msgid "key %s: key material on-card - skipped\n"
+msgstr "key %s: key material on-card - skipped\n"
+
+#: g10/export.c:1846
+msgid "exporting secret keys not allowed\n"
+msgstr "exporting secret keys not allowed\n"
+
+#: g10/export.c:1923
+#, 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:2004
+msgid "WARNING: nothing exported\n"
+msgstr "WARNING: nothing exported\n"
+
+#: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
+#: g10/plaintext.c:151 g10/plaintext.c:174
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "error creating '%s': %s\n"
+
+#: g10/getkey.c:257
+msgid "[User ID not found]"
+msgstr "[User ID not found]"
+
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
+#, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "(check argument of option '%s')\n"
+
+#: g10/getkey.c:516
+#, c-format
+msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
+msgstr "Warning: ‘%s’ should be a long key ID or a fingerprint\n"
+
+#: g10/getkey.c:546
+#, c-format
+msgid "error looking up: %s\n"
+msgstr "error looking up: %s\n"
+
+#: g10/getkey.c:636
+#, c-format
+msgid "Warning: %s appears in the keyring %d times\n"
+msgstr "Warning: %s appears in the keyring %d times\n"
+
+#: g10/getkey.c:1431
+#, c-format
+msgid "automatically retrieved '%s' via %s\n"
+msgstr "automatically retrieved ‘%s’ via %s\n"
+
+#: g10/getkey.c:1437
+#, c-format
+msgid "error retrieving '%s' via %s: %s\n"
+msgstr "error retrieving ‘%s’ via %s: %s\n"
+
+#: g10/getkey.c:1439
+msgid "No fingerprint"
+msgstr "No fingerprint"
+
+#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
+#: g10/revoke.c:701
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "secret key “%s” not found: %s\n"
+
+#: g10/getkey.c:1735
+#, 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:1743
+#, 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:1750
+#, c-format
+msgid "all values passed to '%s' ignored\n"
+msgstr "all values passed to ‘%s’ ignored\n"
+
+#: g10/getkey.c:2545
+#, 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:3377
+#, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "using subkey %s instead of primary key %s\n"
+
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
+msgid "make a signature"
+msgstr "make a signature"
+
- #: g10/gpg.c:418
++#: g10/gpg.c:421
+msgid "make a clear text signature"
+msgstr "make a clear text signature"
+
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
+msgid "make a detached signature"
+msgstr "make a detached signature"
+
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
+msgid "encrypt data"
+msgstr "encrypt data"
+
- #: g10/gpg.c:422
++#: g10/gpg.c:425
+msgid "encryption only with symmetric cipher"
+msgstr "encryption only with symmetric cipher"
+
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
+msgid "decrypt data (default)"
+msgstr "decrypt data (default)"
+
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
+msgid "verify a signature"
+msgstr "verify a signature"
+
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
+msgid "list keys"
+msgstr "list keys"
+
- #: g10/gpg.c:430
++#: g10/gpg.c:433
+msgid "list keys and signatures"
+msgstr "list keys and signatures"
+
- #: g10/gpg.c:431
++#: g10/gpg.c:434
+msgid "list and check key signatures"
+msgstr "list and check key signatures"
+
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
+msgid "list keys and fingerprints"
+msgstr "list keys and fingerprints"
+
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
+msgid "list secret keys"
+msgstr "list secret keys"
+
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
+msgid "generate a new key pair"
+msgstr "generate a new key pair"
+
- #: g10/gpg.c:437
++#: g10/gpg.c:440
+msgid "quickly generate a new key pair"
+msgstr "quickly generate a new key pair"
+
- #: g10/gpg.c:439
++#: g10/gpg.c:442
+msgid "quickly add a new user-id"
+msgstr "quickly add a new user-id"
+
- #: g10/gpg.c:442
++#: g10/gpg.c:445
+msgid "quickly revoke a user-id"
+msgstr "quickly revoke a user-id"
+
- #: g10/gpg.c:444
++#: g10/gpg.c:447
+msgid "full featured key pair generation"
+msgstr "full featured key pair generation"
+
- #: g10/gpg.c:445
++#: g10/gpg.c:448
+msgid "generate a revocation certificate"
+msgstr "generate a revocation certificate"
+
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
+msgid "remove keys from the public keyring"
+msgstr "remove keys from the public keyring"
+
- #: g10/gpg.c:449
++#: g10/gpg.c:452
+msgid "remove keys from the secret keyring"
+msgstr "remove keys from the secret keyring"
+
- #: g10/gpg.c:451
++#: g10/gpg.c:454
+msgid "quickly sign a key"
+msgstr "quickly sign a key"
+
- #: g10/gpg.c:453
++#: g10/gpg.c:456
+msgid "quickly sign a key locally"
+msgstr "quickly sign a key locally"
+
- #: g10/gpg.c:454
++#: g10/gpg.c:457
+msgid "sign a key"
+msgstr "sign a key"
+
- #: g10/gpg.c:455
++#: g10/gpg.c:458
+msgid "sign a key locally"
+msgstr "sign a key locally"
+
- #: g10/gpg.c:456
++#: g10/gpg.c:459
+msgid "sign or edit a key"
+msgstr "sign or edit a key"
+
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
+msgid "change a passphrase"
+msgstr "change a passphrase"
+
- #: g10/gpg.c:460
++#: g10/gpg.c:463
+msgid "export keys"
+msgstr "export keys"
+
- #: g10/gpg.c:461
++#: g10/gpg.c:464
+msgid "export keys to a keyserver"
+msgstr "export keys to a keyserver"
+
- #: g10/gpg.c:462
++#: g10/gpg.c:465
+msgid "import keys from a keyserver"
+msgstr "import keys from a keyserver"
+
- #: g10/gpg.c:464
++#: g10/gpg.c:467
+msgid "search for keys on a keyserver"
+msgstr "search for keys on a keyserver"
+
- #: g10/gpg.c:466
++#: g10/gpg.c:469
+msgid "update all keys from a keyserver"
+msgstr "update all keys from a keyserver"
+
- #: g10/gpg.c:472
++#: g10/gpg.c:475
+msgid "import/merge keys"
+msgstr "import/merge keys"
+
- #: g10/gpg.c:475
++#: g10/gpg.c:478
+msgid "print the card status"
+msgstr "print the card status"
+
- #: g10/gpg.c:476
++#: g10/gpg.c:479
+msgid "change data on a card"
+msgstr "change data on a card"
+
- #: g10/gpg.c:477
++#: g10/gpg.c:480
+msgid "change a card's PIN"
+msgstr "change a card's PIN"
+
- #: g10/gpg.c:489
++#: g10/gpg.c:492
+msgid "update the trust database"
+msgstr "update the trust database"
+
- #: g10/gpg.c:498
++#: g10/gpg.c:501
+msgid "print message digests"
+msgstr "print message digests"
+
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
+msgid "run in server mode"
+msgstr "run in server mode"
+
- #: g10/gpg.c:503
++#: g10/gpg.c:506
+msgid "|VALUE|set the TOFU policy for a key"
+msgstr "|VALUE|set the TOFU policy for a key"
+
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
+msgid "create ascii armored output"
+msgstr "create ascii armored output"
+
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|encrypt for USER-ID"
+
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|USER-ID|use USER-ID to sign or decrypt"
+
- #: g10/gpg.c:531
++#: g10/gpg.c:535
+msgid "|N|set compress level to N (0 disables)"
+msgstr "|N|set compress level to N (0 disables)"
+
- #: g10/gpg.c:538
++#: g10/gpg.c:542
+msgid "use canonical text mode"
+msgstr "use canonical text mode"
+
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|write output to FILE"
+
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
+msgid "do not make any changes"
+msgstr "do not make any changes"
+
- #: g10/gpg.c:570
++#: g10/gpg.c:575
+msgid "prompt before overwriting"
+msgstr "prompt before overwriting"
+
- #: g10/gpg.c:618
++#: g10/gpg.c:623
+msgid "use strict OpenPGP behavior"
+msgstr "use strict OpenPGP behavior"
+
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
+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:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
+msgid ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file] sign and encrypt for user Bob\n"
+" --clearsign [file] make a clear text signature\n"
+" --detach-sign [file] make a detached signature\n"
+" --list-keys [names] show keys\n"
+" --fingerprint [names] show fingerprints\n"
+msgstr ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file] sign and encrypt for user Bob\n"
+" --clearsign [file] make a clear text signature\n"
+" --detach-sign [file] make a detached signature\n"
+" --list-keys [names] show keys\n"
+" --fingerprint [names] show fingerprints\n"
+
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
+msgid "Usage: @GPG@ [options] [files] (-h for help)"
+msgstr "Usage: @GPG@ [options] [files] (-h for help)"
+
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
+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:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Supported algorithms:\n"
+
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
+msgid "Cipher: "
+msgstr "Cipher: "
+
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
+msgid "Hash: "
+msgstr "Hash: "
+
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
+msgid "Compression: "
+msgstr "Compression: "
+
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
+#, c-format
+msgid "usage: %s [options] %s\n"
+msgstr "usage: %s [options] %s\n"
+
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
+msgid "conflicting commands\n"
+msgstr "conflicting commands\n"
+
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
+#, c-format
+msgid "no = sign found in group definition '%s'\n"
+msgstr "no = sign found in group definition ‘%s’\n"
+
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
+#, c-format
+msgid "WARNING: unsafe ownership on homedir '%s'\n"
+msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
+
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
+#, c-format
+msgid "WARNING: unsafe ownership on configuration file '%s'\n"
+msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
+
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
+#, c-format
+msgid "WARNING: unsafe ownership on extension '%s'\n"
+msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
+
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
+#, c-format
+msgid "WARNING: unsafe permissions on homedir '%s'\n"
+msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
+
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
+#, c-format
+msgid "WARNING: unsafe permissions on configuration file '%s'\n"
+msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
+
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
+#, c-format
+msgid "WARNING: unsafe permissions on extension '%s'\n"
+msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
+
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
+#, 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:1551
++#: g10/gpg.c:1556
+#, 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:1554
++#: g10/gpg.c:1559
+#, 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:1560
++#: g10/gpg.c:1565
+#, 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:1563
++#: g10/gpg.c:1568
+#, 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:1566
++#: g10/gpg.c:1571
+#, 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:1773
++#: g10/gpg.c:1778
+#, c-format
+msgid "unknown configuration item '%s'\n"
+msgstr "unknown configuration item ‘%s’\n"
+
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
+msgid "display photo IDs during key listings"
+msgstr "display photo IDs during key listings"
+
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
+msgid "show key usage information during key listings"
+msgstr "show key usage information during key listings"
+
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
+msgid "show policy URLs during signature listings"
+msgstr "show policy URLs during signature listings"
+
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
+msgid "show all notations during signature listings"
+msgstr "show all notations during signature listings"
+
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
+msgid "show IETF standard notations during signature listings"
+msgstr "show IETF standard notations during signature listings"
+
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
+msgid "show user-supplied notations during signature listings"
+msgstr "show user-supplied notations during signature listings"
+
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
+msgid "show preferred keyserver URLs during signature listings"
+msgstr "show preferred keyserver URLs during signature listings"
+
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
+msgid "show user ID validity during key listings"
+msgstr "show user ID validity during key listings"
+
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
+msgid "show revoked and expired user IDs in key listings"
+msgstr "show revoked and expired user IDs in key listings"
+
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
+msgid "show revoked and expired subkeys in key listings"
+msgstr "show revoked and expired subkeys in key listings"
+
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
+msgid "show the keyring name in key listings"
+msgstr "show the keyring name in key listings"
+
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
+msgid "show expiration dates during signature listings"
+msgstr "show expiration dates during signature listings"
+
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
+msgid "available TOFU policies:\n"
+msgstr "available TOFU policies:\n"
+
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
+#, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "unknown TOFU policy ‘%s’\n"
+
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
+msgid "(use \"help\" to list choices)\n"
+msgstr "(use “help” to list choices)\n"
+
- #: g10/gpg.c:2041
- #, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "unknown TOFU DB format ‘%s’\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
+#, c-format
+msgid "Note: old default options file '%s' ignored\n"
+msgstr "Note: old default options file ‘%s’ ignored\n"
+
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr "libgcrypt is too old (need %s, have %s)\n"
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
+#, c-format
+msgid "Note: %s is not for normal use!\n"
+msgstr "Note: %s is not for normal use!\n"
+
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
+#, c-format
+msgid "'%s' is not a valid signature expiration\n"
+msgstr "‘%s’ is not a valid signature expiration\n"
+
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
++#, c-format
++msgid "\"%s\" is not a proper mail address\n"
++msgstr "“%s” is not a proper mail address\n"
++
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
+#, c-format
+msgid "invalid pinentry mode '%s'\n"
+msgstr "invalid pinentry mode ‘%s’\n"
+
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
+#, c-format
+msgid "'%s' is not a valid character set\n"
+msgstr "‘%s’ is not a valid character set\n"
+
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
+msgid "could not parse keyserver URL\n"
+msgstr "could not parse keyserver URL\n"
+
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: invalid keyserver options\n"
+
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
+msgid "invalid keyserver options\n"
+msgstr "invalid keyserver options\n"
+
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: invalid import options\n"
+
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
+msgid "invalid import options\n"
+msgstr "invalid import options\n"
+
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
+#, c-format
+msgid "invalid filter option: %s\n"
+msgstr "invalid filter option: %s\n"
+
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: invalid export options\n"
+
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
+msgid "invalid export options\n"
+msgstr "invalid export options\n"
+
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
+#, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: invalid list options\n"
+
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
+msgid "invalid list options\n"
+msgstr "invalid list options\n"
+
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
+msgid "display photo IDs during signature verification"
+msgstr "display photo IDs during signature verification"
+
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
+msgid "show policy URLs during signature verification"
+msgstr "show policy URLs during signature verification"
+
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
+msgid "show all notations during signature verification"
+msgstr "show all notations during signature verification"
+
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
+msgid "show IETF standard notations during signature verification"
+msgstr "show IETF standard notations during signature verification"
+
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
+msgid "show user-supplied notations during signature verification"
+msgstr "show user-supplied notations during signature verification"
+
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "show preferred keyserver URLs during signature verification"
+
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
+msgid "show user ID validity during signature verification"
+msgstr "show user ID validity during signature verification"
+
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
+msgid "show revoked and expired user IDs in signature verification"
+msgstr "show revoked and expired user IDs in signature verification"
+
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
+msgid "show only the primary user ID in signature verification"
+msgstr "show only the primary user ID in signature verification"
+
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
+msgid "validate signatures with PKA data"
+msgstr "validate signatures with PKA data"
+
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr "elevate the trust of signatures with valid PKA data"
+
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
+#, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: invalid verify options\n"
+
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
+msgid "invalid verify options\n"
+msgstr "invalid verify options\n"
+
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "unable to set exec-path to %s\n"
+
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
+#, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
+msgid "invalid auto-key-locate list\n"
+msgstr "invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
+msgid "WARNING: program may create a core file!\n"
+msgstr "WARNING: program may create a core file!\n"
+
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "WARNING: %s overrides %s\n"
+
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s not allowed with %s!\n"
+
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s makes no sense with %s!\n"
+
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
+msgid "WARNING: running with faked system time: "
+msgstr "WARNING: running with faked system time: "
+
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
+#, 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:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
+msgid "selected cipher algorithm is invalid\n"
+msgstr "selected cipher algorithm is invalid\n"
+
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
+msgid "selected digest algorithm is invalid\n"
+msgstr "selected digest algorithm is invalid\n"
+
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
+msgid "selected compression algorithm is invalid\n"
+msgstr "selected compression algorithm is invalid\n"
+
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "selected certification digest algorithm is invalid\n"
+
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed must be greater than 0\n"
+
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed must be greater than 1\n"
+
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
+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:3599
++#: g10/gpg.c:3588
+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:3601
++#: g10/gpg.c:3590
+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:3604
++#: g10/gpg.c:3593
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
+msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
+
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
+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:3615
++#: g10/gpg.c:3604
+msgid "invalid default preferences\n"
+msgstr "invalid default preferences\n"
+
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
+msgid "invalid personal cipher preferences\n"
+msgstr "invalid personal cipher preferences\n"
+
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
+msgid "invalid personal digest preferences\n"
+msgstr "invalid personal digest preferences\n"
+
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
+msgid "invalid personal compress preferences\n"
+msgstr "invalid personal compress preferences\n"
+
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s does not yet work with %s\n"
+
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
+#, c-format
+msgid "you may not use cipher algorithm '%s' while in %s mode\n"
+msgstr "you may not use cipher algorithm ‘%s’ while in %s mode\n"
+
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
+#, c-format
+msgid "you may not use digest algorithm '%s' while in %s mode\n"
+msgstr "you may not use digest algorithm ‘%s’ while in %s mode\n"
+
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
+#, c-format
+msgid "you may not use compression algorithm '%s' while in %s mode\n"
+msgstr "you may not use compression algorithm ‘%s’ while in %s mode\n"
+
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "failed to initialize the TrustDB: %s\n"
+
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
+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:3883
++#: g10/gpg.c:3872
+msgid "--store [filename]"
+msgstr "--store [filename]"
+
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
+msgid "--symmetric [filename]"
+msgstr "--symmetric [filename]"
+
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
+#, c-format
+msgid "symmetric encryption of '%s' failed: %s\n"
+msgstr "symmetric encryption of ‘%s’ failed: %s\n"
+
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
+msgid "--encrypt [filename]"
+msgstr "--encrypt [filename]"
+
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
+msgid "--symmetric --encrypt [filename]"
+msgstr "--symmetric --encrypt [filename]"
+
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
+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:3929
++#: g10/gpg.c:3918
+#, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "you cannot use --symmetric --encrypt while in %s mode\n"
+
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
+msgid "--sign [filename]"
+msgstr "--sign [filename]"
+
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [filename]"
+
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--symmetric --sign --encrypt [filename]"
+
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
+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:3989
++#: g10/gpg.c:3978
+#, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [filename]"
+
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
+msgid "--clearsign [filename]"
+msgstr "--clearsign [filename]"
+
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
+msgid "--decrypt [filename]"
+msgstr "--decrypt [filename]"
+
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
+msgid "--sign-key user-id"
+msgstr "--sign-key user-id"
+
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
+msgid "--lsign-key user-id"
+msgstr "--lsign-key user-id"
+
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key user-id [commands]"
+
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
+msgid "--passwd <user-id>"
+msgstr "--passwd <user-id>"
+
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "keyserver send failed: %s\n"
+
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "keyserver receive failed: %s\n"
+
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "key export failed: %s\n"
+
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
+#, c-format
+msgid "export as ssh key failed: %s\n"
+msgstr "export as ssh key failed: %s\n"
+
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "keyserver search failed: %s\n"
+
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "keyserver refresh failed: %s\n"
+
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "dearmoring failed: %s\n"
+
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "enarmoring failed: %s\n"
+
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
+#, c-format
+msgid "invalid hash algorithm '%s'\n"
+msgstr "invalid hash algorithm ‘%s’\n"
+
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
+#, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "error parsing key specification '%s': %s\n"
+
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
+#, 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:4740
++#: g10/gpg.c:4729
+msgid "[filename]"
+msgstr "[filename]"
+
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
+msgid "Go ahead and type your message ...\n"
+msgstr "Go ahead and type your message ...\n"
+
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
+msgid "the given certification policy URL is invalid\n"
+msgstr "the given certification policy URL is invalid\n"
+
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
+msgid "the given signature policy URL is invalid\n"
+msgstr "the given signature policy URL is invalid\n"
+
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
+msgid "the given preferred keyserver URL is invalid\n"
+msgstr "the given preferred keyserver URL is invalid\n"
+
+#: g10/gpgv.c:75
+msgid "|FILE|take the keys from the keyring FILE"
+msgstr "|FILE|take the keys from the keyring FILE"
+
+#: g10/gpgv.c:77
+msgid "make timestamp conflicts only a warning"
+msgstr "make timestamp conflicts only a warning"
+
+#: g10/gpgv.c:79 sm/gpgsm.c:343
+msgid "|FD|write status info to this FD"
+msgstr "|FD|write status info to this FD"
+
+#: g10/gpgv.c:83
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr "|ALGO|reject signatures made with ALGO"
+
+#: g10/gpgv.c:120
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Usage: gpgv [options] [files] (-h for help)"
+
+#: g10/gpgv.c:122
+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:134
++#: g10/import.c:138
+msgid "import signatures that are marked as local-only"
+msgstr "import signatures that are marked as local-only"
+
- #: g10/import.c:137
++#: g10/import.c:141
+msgid "repair damage from the pks keyserver during import"
+msgstr "repair damage from the pks keyserver during import"
+
- #: g10/import.c:140
++#: g10/import.c:144
+msgid "do not clear the ownertrust values during import"
+msgstr "do not clear the ownertrust values during import"
+
- #: g10/import.c:143
++#: g10/import.c:147
+msgid "do not update the trustdb after import"
+msgstr "do not update the trustdb after import"
+
- #: g10/import.c:146
++#: g10/import.c:150
+msgid "show key during import"
+msgstr "show key during import"
+
- #: g10/import.c:149
++#: g10/import.c:153
+msgid "only accept updates to existing keys"
+msgstr "only accept updates to existing keys"
+
- #: g10/import.c:152
++#: g10/import.c:156
+msgid "remove unusable parts from key after import"
+msgstr "remove unusable parts from key after import"
+
- #: g10/import.c:155
++#: g10/import.c:159
+msgid "remove as much as possible from key after import"
+msgstr "remove as much as possible from key after import"
+
- #: g10/import.c:158
++#: g10/import.c:162
+msgid "run import filters and export key immediately"
+msgstr "run import filters and export key immediately"
+
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "skipping block of type %d\n"
+
- #: g10/import.c:536
++#: g10/import.c:542
+#, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu keys processed so far\n"
+
- #: g10/import.c:606
++#: g10/import.c:612
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Total number processed: %lu\n"
+
- #: g10/import.c:609
++#: g10/import.c:615
+#, c-format
+msgid " skipped PGP-2 keys: %lu\n"
+msgstr " skipped PGP-2 keys: %lu\n"
+
- #: g10/import.c:611
++#: g10/import.c:617
+#, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " skipped new keys: %lu\n"
+
- #: g10/import.c:614
++#: g10/import.c:620
+#, c-format
+msgid " w/o user IDs: %lu\n"
+msgstr " w/o user IDs: %lu\n"
+
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
+#, c-format
+msgid " imported: %lu"
+msgstr " imported: %lu"
+
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
+#, c-format
+msgid " unchanged: %lu\n"
+msgstr " unchanged: %lu\n"
+
- #: g10/import.c:623
++#: g10/import.c:629
+#, c-format
+msgid " new user IDs: %lu\n"
+msgstr " new user IDs: %lu\n"
+
- #: g10/import.c:625
++#: g10/import.c:631
+#, c-format
+msgid " new subkeys: %lu\n"
+msgstr " new subkeys: %lu\n"
+
- #: g10/import.c:627
++#: g10/import.c:633
+#, c-format
+msgid " new signatures: %lu\n"
+msgstr " new signatures: %lu\n"
+
- #: g10/import.c:629
++#: g10/import.c:635
+#, c-format
+msgid " new key revocations: %lu\n"
+msgstr " new key revocations: %lu\n"
+
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
+#, c-format
+msgid " secret keys read: %lu\n"
+msgstr " secret keys read: %lu\n"
+
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
+#, c-format
+msgid " secret keys imported: %lu\n"
+msgstr " secret keys imported: %lu\n"
+
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr " secret keys unchanged: %lu\n"
+
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
+#, c-format
+msgid " not imported: %lu\n"
+msgstr " not imported: %lu\n"
+
- #: g10/import.c:639
++#: g10/import.c:645
+#, c-format
+msgid " signatures cleaned: %lu\n"
+msgstr " signatures cleaned: %lu\n"
+
- #: g10/import.c:641
++#: g10/import.c:647
+#, c-format
+msgid " user IDs cleaned: %lu\n"
+msgstr " user IDs cleaned: %lu\n"
+
- #: g10/import.c:985
++#: g10/import.c:991
+#, 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:1027
++#: g10/import.c:1033
+#, c-format
+msgid " \"%s\": preference for cipher algorithm %s\n"
+msgstr " “%s”: preference for cipher algorithm %s\n"
+
- #: g10/import.c:1042
++#: g10/import.c:1048
+#, c-format
+msgid " \"%s\": preference for digest algorithm %s\n"
+msgstr " “%s”: preference for digest algorithm %s\n"
+
- #: g10/import.c:1054
++#: g10/import.c:1060
+#, c-format
+msgid " \"%s\": preference for compression algorithm %s\n"
+msgstr " “%s”: preference for compression algorithm %s\n"
+
- #: g10/import.c:1067
++#: g10/import.c:1073
+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:1069
++#: g10/import.c:1075
+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:1094
++#: g10/import.c:1100
+#, 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:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
+#, c-format
+msgid "key %s: no user ID\n"
+msgstr "key %s: no user ID\n"
+
- #: g10/import.c:1233
++#: g10/import.c:1312
+#, c-format
+msgid "key %s: %s\n"
+msgstr "key %s: %s\n"
+
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
+msgid "rejected by import screener"
+msgstr "rejected by import screener"
+
- #: g10/import.c:1264
++#: g10/import.c:1343
+#, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "key %s: PKS subkey corruption repaired\n"
+
- #: g10/import.c:1282
++#: g10/import.c:1361
+#, 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:1292
++#: g10/import.c:1371
+#, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "key %s: no valid user IDs\n"
+
- #: g10/import.c:1294
++#: g10/import.c:1373
+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:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
+#, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "key %s: public key not found: %s\n"
+
- #: g10/import.c:1353
++#: g10/import.c:1437
+#, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "key %s: new key - skipped\n"
+
- #: g10/import.c:1368
++#: g10/import.c:1452
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "no writable keyring found: %s\n"
+
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
+#, c-format
+msgid "error writing keyring '%s': %s\n"
+msgstr "error writing keyring '%s': %s\n"
+
- #: g10/import.c:1397
++#: g10/import.c:1481
+#, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "key %s: public key “%s” imported\n"
+
- #: g10/import.c:1421
++#: g10/import.c:1505
+#, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "key %s: doesn't match our copy\n"
+
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
+#, 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:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
+#, 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:1488
++#: g10/import.c:1572
+#, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "key %s: “%s” 1 new user ID\n"
+
- #: g10/import.c:1491
++#: g10/import.c:1575
+#, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "key %s: “%s” %d new user IDs\n"
+
- #: g10/import.c:1494
++#: g10/import.c:1578
+#, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "key %s: “%s” 1 new signature\n"
+
- #: g10/import.c:1497
++#: g10/import.c:1581
+#, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "key %s: “%s” %d new signatures\n"
+
- #: g10/import.c:1500
++#: g10/import.c:1584
+#, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %s: “%s” 1 new subkey\n"
+
- #: g10/import.c:1503
++#: g10/import.c:1587
+#, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %s: “%s” %d new subkeys\n"
+
- #: g10/import.c:1506
++#: g10/import.c:1590
+#, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "key %s: “%s” %d signature cleaned\n"
+
- #: g10/import.c:1509
++#: g10/import.c:1593
+#, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "key %s: “%s” %d signatures cleaned\n"
+
- #: g10/import.c:1512
++#: g10/import.c:1596
+#, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "key %s: “%s” %d user ID cleaned\n"
+
- #: g10/import.c:1515
++#: g10/import.c:1599
+#, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "key %s: “%s” %d user IDs cleaned\n"
+
- #: g10/import.c:1538
++#: g10/import.c:1622
+#, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "key %s: “%s” not changed\n"
+
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
+#, c-format
+msgid "key %s: secret key imported\n"
+msgstr "key %s: secret key imported\n"
+
- #: g10/import.c:1858
++#: g10/import.c:1942
+#, c-format
+msgid "key %s: secret key already exists\n"
+msgstr "key %s: secret key already exists\n"
+
- #: g10/import.c:1866
++#: g10/import.c:1950
+#, c-format
+msgid "key %s: error sending to agent: %s\n"
+msgstr "key %s: error sending to agent: %s\n"
+
- #: g10/import.c:1971
++#: g10/import.c:2055
+#, c-format
+msgid "secret key %s: %s\n"
+msgstr "secret key %s: %s\n"
+
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
+msgid "importing secret keys not allowed\n"
+msgstr "importing secret keys not allowed\n"
+
- #: g10/import.c:2015
++#: g10/import.c:2099
+#, 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:2084
++#: g10/import.c:2171
+#, 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:2133
++#: g10/import.c:2226
+#, 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:2182
++#: g10/import.c:2275
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "key %s: invalid revocation certificate: %s - rejected\n"
+
- #: g10/import.c:2215
++#: g10/import.c:2308
+#, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "key %s: “%s” revocation certificate imported\n"
+
- #: g10/import.c:2291
++#: g10/import.c:2384
+#, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "key %s: no user ID for signature\n"
+
- #: g10/import.c:2308
++#: g10/import.c:2401
+#, 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:2310
++#: g10/import.c:2403
+#, 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:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
+#, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "key %s: unsupported public key algorithm\n"
+
- #: g10/import.c:2328
++#: g10/import.c:2421
+#, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "key %s: invalid direct key signature\n"
+
- #: g10/import.c:2342
++#: g10/import.c:2435
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "key %s: no subkey for key binding\n"
+
- #: g10/import.c:2355
++#: g10/import.c:2448
+#, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "key %s: invalid subkey binding\n"
+
- #: g10/import.c:2371
++#: g10/import.c:2464
+#, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "key %s: removed multiple subkey binding\n"
+
- #: g10/import.c:2393
++#: g10/import.c:2486
+#, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "key %s: no subkey for key revocation\n"
+
- #: g10/import.c:2406
++#: g10/import.c:2499
+#, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "key %s: invalid subkey revocation\n"
+
- #: g10/import.c:2421
++#: g10/import.c:2514
+#, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "key %s: removed multiple subkey revocation\n"
+
- #: g10/import.c:2463
++#: g10/import.c:2556
+#, c-format
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "key %s: skipped user ID “%s”\n"
+
- #: g10/import.c:2487
++#: g10/import.c:2580
+#, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "key %s: skipped subkey\n"
+
- #: g10/import.c:2516
++#: g10/import.c:2609
+#, 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:2527
++#: g10/import.c:2620
+#, 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:2545
++#: g10/import.c:2638
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "key %s: invalid revocation certificate: %s - skipped\n"
+
- #: g10/import.c:2559
++#: g10/import.c:2652
+#, 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:2567
++#: g10/import.c:2660
+#, 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:2696
++#: g10/import.c:2789
+#, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %s: duplicated user ID detected - merged\n"
+
- #: g10/import.c:2760
++#: g10/import.c:2853
+#, 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:2776
++#: g10/import.c:2869
+#, 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:2840
++#: g10/import.c:2933
+#, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "key %s: “%s” revocation certificate added\n"
+
- #: g10/import.c:2878
++#: g10/import.c:2971
+#, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "key %s: direct key signature added\n"
+
+#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
+#, c-format
+msgid "error creating keybox '%s': %s\n"
+msgstr "error creating keybox '%s': %s\n"
+
+#: g10/keydb.c:405 g10/keydb.c:432
+#, c-format
+msgid "error creating keyring '%s': %s\n"
+msgstr "error creating keyring '%s': %s\n"
+
+#: g10/keydb.c:441 sm/keydb.c:229
+#, c-format
+msgid "keybox '%s' created\n"
+msgstr "keybox ‘%s’ created\n"
+
+#: g10/keydb.c:443
+#, c-format
+msgid "keyring '%s' created\n"
+msgstr "keyring ‘%s’ created\n"
+
+#: g10/keydb.c:822
+#, c-format
+msgid "keyblock resource '%s': %s\n"
+msgstr "keyblock resource '%s': %s\n"
+
+#: g10/keydb.c:907
+#, c-format
+msgid "error opening key DB: %s\n"
+msgstr "error opening key DB: %s\n"
+
+#: g10/keydb.c:1778
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "failed to rebuild keyring cache: %s\n"
+
+#: g10/keyedit.c:264
+msgid "[revocation]"
+msgstr "[revocation]"
+
+#: g10/keyedit.c:264
+msgid "[self-signature]"
+msgstr "[self-signature]"
+
+#: g10/keyedit.c:618
+#, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr ""
+"can't check signature with unsupported public-key algorithm (%d): %s.\n"
+
+#: g10/keyedit.c:627
+#, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+
+#: g10/keyedit.c:789
+msgid " (reordered signatures follow)"
+msgstr " (reordered signatures follow)"
+
+#: g10/keyedit.c:902
+#, c-format
+msgid "key %s:\n"
+msgstr "key %s:\n"
+
+#: g10/keyedit.c:905
+#, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "%d duplicate signature removed\n"
+msgstr[1] "%d duplicate signatures removed\n"
+
+#: g10/keyedit.c:908 g10/keylist.c:480
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "%d signature not checked due to a missing key\n"
+msgstr[1] "%d signatures not checked due to missing keys\n"
+
+#: g10/keyedit.c:912 g10/keylist.c:476
+#, c-format
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d bad signature\n"
+msgstr[1] "%d bad signatures\n"
+
+#: g10/keyedit.c:916
+#, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "%d signature reordered\n"
+msgstr[1] "%d signatures reordered\n"
+
+#: g10/keyedit.c:921
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+"Warning: errors found and only checked self-signatures, run ‘%s’ to check "
+"all signatures.\n"
+
+#: g10/keyedit.c:981 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:985 g10/pkclist.c:286
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = I trust marginally\n"
+
+#: g10/keyedit.c:986 g10/pkclist.c:288
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = I trust fully\n"
+
+#: g10/keyedit.c:1004
+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:1021
+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:1149
+#, 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:1157
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "User ID “%s” is revoked."
+
+#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
+#: g10/keyedit.c:2235
+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:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
+#: g10/keyedit.c:2240 g10/keyedit.c:3164
+msgid " Unable to sign.\n"
+msgstr " Unable to sign.\n"
+
+#: g10/keyedit.c:1185
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User ID “%s” is expired."
+
+#: g10/keyedit.c:1213
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "User ID “%s” is not self-signed."
+
+#: g10/keyedit.c:1242
+#, c-format
+msgid "User ID \"%s\" is signable. "
+msgstr "User ID “%s” is signable. "
+
+#: g10/keyedit.c:1244
+msgid "Sign it? (y/N) "
+msgstr "Sign it? (y/N) "
+
+#: g10/keyedit.c:1271
+#, 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:1280
+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:1293
+#, 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:1298
+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:1319
+#, 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:1324
+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:1344
+#, 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:1348
+#, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "“%s” was already signed by key %s\n"
+
+#: g10/keyedit.c:1353
+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:1375
+#, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Nothing to sign with key %s\n"
+
+#: g10/keyedit.c:1399
+msgid "This key has expired!"
+msgstr "This key has expired!"
+
+#: g10/keyedit.c:1417
+#, 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:1423
+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:1464
+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:1469
+#, c-format
+msgid " (0) I will not answer.%s\n"
+msgstr " (0) I will not answer.%s\n"
+
+#: g10/keyedit.c:1471
+#, 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:1473
+#, c-format
+msgid " (2) I have done casual checking.%s\n"
+msgstr " (2) I have done casual checking.%s\n"
+
+#: g10/keyedit.c:1476
+#, 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:1483
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Your selection? (enter ‘?’ for more information): "
+
+#: g10/keyedit.c:1510
+#, 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:1518
+msgid "This will be a self-signature.\n"
+msgstr "This will be a self-signature.\n"
+
+#: g10/keyedit.c:1523
+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:1530
+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:1540
+msgid "The signature will be marked as non-exportable.\n"
+msgstr "The signature will be marked as non-exportable.\n"
+
+#: g10/keyedit.c:1547
+msgid "The signature will be marked as non-revocable.\n"
+msgstr "The signature will be marked as non-revocable.\n"
+
+#: g10/keyedit.c:1554
+msgid "I have not checked this key at all.\n"
+msgstr "I have not checked this key at all.\n"
+
+#: g10/keyedit.c:1559
+msgid "I have checked this key casually.\n"
+msgstr "I have checked this key casually.\n"
+
+#: g10/keyedit.c:1564
+msgid "I have checked this key very carefully.\n"
+msgstr "I have checked this key very carefully.\n"
+
+#: g10/keyedit.c:1576
+msgid "Really sign? (y/N) "
+msgstr "Really sign? (y/N) "
+
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "signing failed: %s\n"
+
+#: g10/keyedit.c:1714
+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:1744
+#, c-format
+msgid "key %s: error changing passphrase: %s\n"
+msgstr "key %s: error changing passphrase: %s\n"
+
+#: g10/keyedit.c:1858
+msgid "save and quit"
+msgstr "save and quit"
+
+#: g10/keyedit.c:1861
+msgid "show key fingerprint"
+msgstr "show key fingerprint"
+
+#: g10/keyedit.c:1862
+msgid "show the keygrip"
+msgstr "show the keygrip"
+
+#: g10/keyedit.c:1863
+msgid "list key and user IDs"
+msgstr "list key and user IDs"
+
+#: g10/keyedit.c:1865
+msgid "select user ID N"
+msgstr "select user ID N"
+
+#: g10/keyedit.c:1866
+msgid "select subkey N"
+msgstr "select subkey N"
+
+#: g10/keyedit.c:1867
+msgid "check signatures"
+msgstr "check signatures"
+
+#: g10/keyedit.c:1873
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr "sign selected user IDs [* see below for related commands]"
+
+#: g10/keyedit.c:1878
+msgid "sign selected user IDs locally"
+msgstr "sign selected user IDs locally"
+
+#: g10/keyedit.c:1879
+msgid "sign selected user IDs with a trust signature"
+msgstr "sign selected user IDs with a trust signature"
+
+#: g10/keyedit.c:1881
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr "sign selected user IDs with a non-revocable signature"
+
+#: g10/keyedit.c:1883
+msgid "add a user ID"
+msgstr "add a user ID"
+
+#: g10/keyedit.c:1885
+msgid "add a photo ID"
+msgstr "add a photo ID"
+
+#: g10/keyedit.c:1886
+msgid "delete selected user IDs"
+msgstr "delete selected user IDs"
+
+#: g10/keyedit.c:1889
+msgid "add a subkey"
+msgstr "add a subkey"
+
+#: g10/keyedit.c:1892
+msgid "add a key to a smartcard"
+msgstr "add a key to a smartcard"
+
+#: g10/keyedit.c:1894
+msgid "move a key to a smartcard"
+msgstr "move a key to a smartcard"
+
+#: g10/keyedit.c:1896
+msgid "move a backup key to a smartcard"
+msgstr "move a backup key to a smartcard"
+
+#: g10/keyedit.c:1898
+msgid "delete selected subkeys"
+msgstr "delete selected subkeys"
+
+#: g10/keyedit.c:1900
+msgid "add a revocation key"
+msgstr "add a revocation key"
+
+#: g10/keyedit.c:1902
+msgid "delete signatures from the selected user IDs"
+msgstr "delete signatures from the selected user IDs"
+
+#: g10/keyedit.c:1904
+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:1906
+msgid "flag the selected user ID as primary"
+msgstr "flag the selected user ID as primary"
+
+#: g10/keyedit.c:1909
+msgid "list preferences (expert)"
+msgstr "list preferences (expert)"
+
+#: g10/keyedit.c:1910
+msgid "list preferences (verbose)"
+msgstr "list preferences (verbose)"
+
+#: g10/keyedit.c:1912
+msgid "set preference list for the selected user IDs"
+msgstr "set preference list for the selected user IDs"
+
+#: g10/keyedit.c:1915
+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:1917
+msgid "set a notation for the selected user IDs"
+msgstr "set a notation for the selected user IDs"
+
+#: g10/keyedit.c:1919
+msgid "change the passphrase"
+msgstr "change the passphrase"
+
+#: g10/keyedit.c:1922
+msgid "change the ownertrust"
+msgstr "change the ownertrust"
+
+#: g10/keyedit.c:1925
+msgid "revoke signatures on the selected user IDs"
+msgstr "revoke signatures on the selected user IDs"
+
+#: g10/keyedit.c:1927
+msgid "revoke selected user IDs"
+msgstr "revoke selected user IDs"
+
+#: g10/keyedit.c:1930
+msgid "revoke key or selected subkeys"
+msgstr "revoke key or selected subkeys"
+
+#: g10/keyedit.c:1932
+msgid "enable key"
+msgstr "enable key"
+
+#: g10/keyedit.c:1933
+msgid "disable key"
+msgstr "disable key"
+
+#: g10/keyedit.c:1935
+msgid "show selected photo IDs"
+msgstr "show selected photo IDs"
+
+#: g10/keyedit.c:1937
+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:1939
+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:2051
+msgid "Secret key is available.\n"
+msgstr "Secret key is available.\n"
+
+#: g10/keyedit.c:2151
+msgid "Need the secret key to do this.\n"
+msgstr "Need the secret key to do this.\n"
+
+#: g10/keyedit.c:2172
+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:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
+msgid "Key is revoked."
+msgstr "Key is revoked."
+
+#: g10/keyedit.c:2251
+msgid "Really sign all user IDs? (y/N) "
+msgstr "Really sign all user IDs? (y/N) "
+
+#: g10/keyedit.c:2255
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Really sign all text user IDs? (y/N) "
+
+#: g10/keyedit.c:2263
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Hint: Select the user IDs to sign\n"
+
+#: g10/keyedit.c:2274
+#, c-format
+msgid "Unknown signature type '%s'\n"
+msgstr "Unknown signature type ‘%s’\n"
+
+#: g10/keyedit.c:2298
+#, 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:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
+msgid "You must select at least one user ID.\n"
+msgstr "You must select at least one user ID.\n"
+
+#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
+#, c-format
+msgid "(Use the '%s' command.)\n"
+msgstr "(Use the ‘%s’ command.)\n"
+
+#: g10/keyedit.c:2325
+msgid "You can't delete the last user ID!\n"
+msgstr "You can't delete the last user ID!\n"
+
+#: g10/keyedit.c:2328
+msgid "Really remove all selected user IDs? (y/N) "
+msgstr "Really remove all selected user IDs? (y/N) "
+
+#: g10/keyedit.c:2329
+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:2386
+msgid "Really move the primary key? (y/N) "
+msgstr "Really move the primary key? (y/N) "
+
+#: g10/keyedit.c:2398 g10/keyedit.c:4850
+msgid "You must select exactly one key.\n"
+msgstr "You must select exactly one key.\n"
+
+#: g10/keyedit.c:2425
+msgid "Command expects a filename argument\n"
+msgstr "Command expects a filename argument\n"
+
+#: g10/keyedit.c:2446
+#, c-format
+msgid "Can't open '%s': %s\n"
+msgstr "Can't open '%s': %s\n"
+
+#: g10/keyedit.c:2463
+#, c-format
+msgid "Error reading backup key from '%s': %s\n"
+msgstr "Error reading backup key from '%s': %s\n"
+
+#: g10/keyedit.c:2498
+msgid "You must select at least one key.\n"
+msgstr "You must select at least one key.\n"
+
+#: g10/keyedit.c:2504
+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:2506
+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:2544
+msgid "Really revoke all selected user IDs? (y/N) "
+msgstr "Really revoke all selected user IDs? (y/N) "
+
+#: g10/keyedit.c:2545
+msgid "Really revoke this user ID? (y/N) "
+msgstr "Really revoke this user ID? (y/N) "
+
+#: g10/keyedit.c:2563
+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:2574
+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:2576
+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:2634
+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:2679
+msgid "Set preference list to:\n"
+msgstr "Set preference list to:\n"
+
+#: g10/keyedit.c:2686
+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:2688
+msgid "Really update the preferences? (y/N) "
+msgstr "Really update the preferences? (y/N) "
+
+#: g10/keyedit.c:2762
+msgid "Save changes? (y/N) "
+msgstr "Save changes? (y/N) "
+
+#: g10/keyedit.c:2766
+msgid "Quit without saving? (y/N) "
+msgstr "Quit without saving? (y/N) "
+
+#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
+#: g10/keyedit.c:3254 g10/keyedit.c:3319
+#, c-format
+msgid "update failed: %s\n"
+msgstr "update failed: %s\n"
+
+#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
+msgid "Key not changed so no update needed.\n"
+msgstr "Key not changed so no update needed.\n"
+
+#: g10/keyedit.c:3025
+#, c-format
+msgid "User ID revocation failed: %s\n"
+msgstr "User ID revocation failed: %s\n"
+
+#: g10/keyedit.c:3070
+#, c-format
+msgid "\"%s\" is not a fingerprint\n"
+msgstr "“%s” is not a fingerprint\n"
+
+#: g10/keyedit.c:3099
+#, c-format
+msgid "\"%s\" is not the primary fingerprint\n"
+msgstr "“%s” is not the primary fingerprint\n"
+
+#: g10/keyedit.c:3235 g10/keyedit.c:3238
+#, c-format
+msgid "Invalid user ID '%s': %s\n"
+msgstr "Invalid user ID '%s': %s\n"
+
+#: g10/keyedit.c:3241
+msgid "No matching user IDs."
+msgstr "No matching user IDs."
+
+#: g10/keyedit.c:3241
+msgid "Nothing to sign.\n"
+msgstr "Nothing to sign.\n"
+
+#: g10/keyedit.c:3414
+msgid "Digest: "
+msgstr "Digest: "
+
+#: g10/keyedit.c:3471
+msgid "Features: "
+msgstr "Features: "
+
+#: g10/keyedit.c:3482
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
+#: g10/keyedit.c:3497 g10/keylist.c:377
+msgid "Preferred keyserver: "
+msgstr "Preferred keyserver: "
+
+#: g10/keyedit.c:3505 g10/keyedit.c:3506
+msgid "Notations: "
+msgstr "Notations: "
+
+#: g10/keyedit.c:3751
+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:3823
+#, 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:3847
+#, 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:3853
+msgid "(sensitive)"
+msgstr "(sensitive)"
+
+#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
+#, c-format
+msgid "created: %s"
+msgstr "created: %s"
+
+#: g10/keyedit.c:3898 g10/keylist.c:1843
+#, c-format
+msgid "revoked: %s"
+msgstr "revoked: %s"
+
+#: g10/keyedit.c:3900 g10/keylist.c:1849
+#, c-format
+msgid "expired: %s"
+msgstr "expired: %s"
+
+#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
+#: g10/keyserver.c:542
+#, c-format
+msgid "expires: %s"
+msgstr "expires: %s"
+
+#: g10/keyedit.c:3904
+#, c-format
+msgid "usage: %s"
+msgstr "usage: %s"
+
+#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
+msgid "card-no: "
+msgstr "card-no: "
+
+#: g10/keyedit.c:3971
+#, c-format
+msgid "trust: %s"
+msgstr "trust: %s"
+
+#: g10/keyedit.c:3975
+#, c-format
+msgid "validity: %s"
+msgstr "validity: %s"
+
+#: g10/keyedit.c:3982
+msgid "This key has been disabled"
+msgstr "This key has been disabled"
+
+#: g10/keyedit.c:4000
+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:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
+msgid "revoked"
+msgstr "revoked"
+
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
+msgid "expired"
+msgstr "expired"
+
+#: g10/keyedit.c:4175
+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:4227
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr "WARNING: Your encryption subkey expires soon.\n"
+
+#: g10/keyedit.c:4228
+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:4287
+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:4292 g10/keyedit.c:4579
+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:4298
+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:4311 g10/keygen.c:2676
+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:4412
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Delete this good signature? (y/N/q)"
+
+#: g10/keyedit.c:4422
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Delete this invalid signature? (y/N/q)"
+
+#: g10/keyedit.c:4426
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Delete this unknown signature? (y/N/q)"
+
+#: g10/keyedit.c:4433
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Really delete this self-signature? (y/N)"
+
+#: g10/keyedit.c:4449
+#, 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:4453
+msgid "Nothing deleted.\n"
+msgstr "Nothing deleted.\n"
+
+#: g10/keyedit.c:4488 g10/trust.c:693
+msgid "invalid"
+msgstr "invalid"
+
+#: g10/keyedit.c:4490
+#, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID “%s” compacted: %s\n"
+
+#: g10/keyedit.c:4496
+#, 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:4504
+#, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID “%s”: already minimized\n"
+
+#: g10/keyedit.c:4505
+#, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User ID “%s”: already clean\n"
+
+#: g10/keyedit.c:4574
+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:4585
+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:4602
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Enter the user ID of the designated revoker: "
+
+#: g10/keyedit.c:4627
+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:4642
+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:4664
+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:4682
+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:4688
+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:4739
+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:4744
+msgid "Changing expiration time for a subkey.\n"
+msgstr "Changing expiration time for a subkey.\n"
+
+#: g10/keyedit.c:4747
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Changing expiration time for the primary key.\n"
+
+#: g10/keyedit.c:4798
+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:4971
+#, c-format
+msgid "signing subkey %s is already cross-certified\n"
+msgstr "signing subkey %s is already cross-certified\n"
+
+#: g10/keyedit.c:4977
+#, 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:5092
+msgid "Please select exactly one user ID.\n"
+msgstr "Please select exactly one user ID.\n"
+
+#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
+#, 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:5304
+msgid "Enter your preferred keyserver URL: "
+msgstr "Enter your preferred keyserver URL: "
+
+#: g10/keyedit.c:5383
+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:5384
+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:5443
+msgid "Enter the notation: "
+msgstr "Enter the notation: "
+
+#: g10/keyedit.c:5590
+msgid "Proceed? (y/N) "
+msgstr "Proceed? (y/N) "
+
+#: g10/keyedit.c:5660
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "No user ID with index %d\n"
+
+#: g10/keyedit.c:5722
+#, c-format
+msgid "No user ID with hash %s\n"
+msgstr "No user ID with hash %s\n"
+
+#: g10/keyedit.c:5823
+#, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "No subkey with key ID '%s'.\n"
+
+#: g10/keyedit.c:5845
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "No subkey with index %d\n"
+
+#: g10/keyedit.c:5986
+#, c-format
+msgid "user ID: \"%s\"\n"
+msgstr "user ID: “%s”\n"
+
+#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#, 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:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
+msgid " (non-exportable)"
+msgstr " (non-exportable)"
+
+#: g10/keyedit.c:5995
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "This signature expired on %s.\n"
+
+#: g10/keyedit.c:6000
+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:6005
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Create a revocation certificate for this signature? (y/N) "
+
+#: g10/keyedit.c:6059
+msgid "Not signed by you.\n"
+msgstr "Not signed by you.\n"
+
+#: g10/keyedit.c:6065
+#, 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:6094
+msgid " (non-revocable)"
+msgstr " (non-revocable)"
+
+#: g10/keyedit.c:6101
+#, c-format
+msgid "revoked by your key %s on %s\n"
+msgstr "revoked by your key %s on %s\n"
+
+#: g10/keyedit.c:6126
+msgid "You are about to revoke these signatures:\n"
+msgstr "You are about to revoke these signatures:\n"
+
+#: g10/keyedit.c:6149
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Really create the revocation certificates? (y/N) "
+
+#: g10/keyedit.c:6182
+msgid "no secret key\n"
+msgstr "no secret key\n"
+
+#: g10/keyedit.c:6230
+#, 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:6240
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "user ID “%s” is already revoked\n"
+
+#: g10/keyedit.c:6257
+#, 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:6370
+#, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Key %s is already revoked.\n"
+
+#: g10/keyedit.c:6432
+#, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Subkey %s is already revoked.\n"
+
+#: g10/keyedit.c:6529
+#, 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:295
+#, c-format
+msgid "preference '%s' duplicated\n"
+msgstr "preference ‘%s’ duplicated\n"
+
+#: g10/keygen.c:302
+msgid "too many cipher preferences\n"
+msgstr "too many cipher preferences\n"
+
+#: g10/keygen.c:304
+msgid "too many digest preferences\n"
+msgstr "too many digest preferences\n"
+
+#: g10/keygen.c:306
+msgid "too many compression preferences\n"
+msgstr "too many compression preferences\n"
+
+#: g10/keygen.c:447
+#, c-format
+msgid "invalid item '%s' in preference string\n"
+msgstr "invalid item ‘%s’ in preference string\n"
+
+#: g10/keygen.c:926
+msgid "writing direct signature\n"
+msgstr "writing direct signature\n"
+
+#: g10/keygen.c:972
+msgid "writing self signature\n"
+msgstr "writing self signature\n"
+
+#: g10/keygen.c:1028
+msgid "writing key binding signature\n"
+msgstr "writing key binding signature\n"
+
+#: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
+#: g10/keygen.c:1600 g10/keygen.c:1605
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "keysize invalid; using %u bits\n"
+
+#: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "keysize rounded up to %u bits\n"
+
+#: g10/keygen.c:1493
+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:1667
+msgid "Sign"
+msgstr "Sign"
+
+#: g10/keygen.c:1670
+msgid "Certify"
+msgstr "Certify"
+
+#: g10/keygen.c:1673
+msgid "Encrypt"
+msgstr "Encrypt"
+
+#: g10/keygen.c:1676
+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:1695
+msgid "SsEeAaQq"
+msgstr "SsEeAaQq"
+
+#: g10/keygen.c:1722
+#, c-format
+msgid "Possible actions for a %s key: "
+msgstr "Possible actions for a %s key: "
+
+#: g10/keygen.c:1728
+msgid "Current allowed actions: "
+msgstr "Current allowed actions: "
+
+#: g10/keygen.c:1733
+#, c-format
+msgid " (%c) Toggle the sign capability\n"
+msgstr " (%c) Toggle the sign capability\n"
+
+#: g10/keygen.c:1736
+#, c-format
+msgid " (%c) Toggle the encrypt capability\n"
+msgstr " (%c) Toggle the encrypt capability\n"
+
+#: g10/keygen.c:1739
+#, c-format
+msgid " (%c) Toggle the authenticate capability\n"
+msgstr " (%c) Toggle the authenticate capability\n"
+
+#: g10/keygen.c:1742
+#, c-format
+msgid " (%c) Finished\n"
+msgstr " (%c) Finished\n"
+
+#: g10/keygen.c:1871 sm/certreqgen-ui.c:161
+msgid "Please select what kind of key you want:\n"
+msgstr "Please select what kind of key you want:\n"
+
+#: g10/keygen.c:1875
+#, c-format
+msgid " (%d) RSA and RSA (default)\n"
+msgstr " (%d) RSA and RSA (default)\n"
+
+#: g10/keygen.c:1879
+#, c-format
+msgid " (%d) DSA and Elgamal\n"
+msgstr " (%d) DSA and Elgamal\n"
+
+#: g10/keygen.c:1881
+#, c-format
+msgid " (%d) DSA (sign only)\n"
+msgstr " (%d) DSA (sign only)\n"
+
+#: g10/keygen.c:1883
+#, c-format
+msgid " (%d) RSA (sign only)\n"
+msgstr " (%d) RSA (sign only)\n"
+
+#: g10/keygen.c:1888
+#, c-format
+msgid " (%d) Elgamal (encrypt only)\n"
+msgstr " (%d) Elgamal (encrypt only)\n"
+
+#: g10/keygen.c:1890
+#, c-format
+msgid " (%d) RSA (encrypt only)\n"
+msgstr " (%d) RSA (encrypt only)\n"
+
+#: g10/keygen.c:1895
+#, c-format
+msgid " (%d) DSA (set your own capabilities)\n"
+msgstr " (%d) DSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1897
+#, c-format
+msgid " (%d) RSA (set your own capabilities)\n"
+msgstr " (%d) RSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1903
+#, c-format
+msgid " (%d) ECC and ECC\n"
+msgstr " (%d) ECC and ECC\n"
+
+#: g10/keygen.c:1905
+#, c-format
+msgid " (%d) ECC (sign only)\n"
+msgstr " (%d) ECC (sign only)\n"
+
+#: g10/keygen.c:1907
+#, c-format
+msgid " (%d) ECC (set your own capabilities)\n"
+msgstr " (%d) ECC (set your own capabilities)\n"
+
+#: g10/keygen.c:1909
+#, c-format
+msgid " (%d) ECC (encrypt only)\n"
+msgstr " (%d) ECC (encrypt only)\n"
+
+#: g10/keygen.c:1913
+#, c-format
+msgid " (%d) Existing key\n"
+msgstr " (%d) Existing key\n"
+
+#: g10/keygen.c:2003 sm/certreqgen-ui.c:206
+msgid "Enter the keygrip: "
+msgstr "Enter the keygrip: "
+
+#: g10/keygen.c:2016 sm/certreqgen-ui.c:214
+msgid "Not a valid keygrip (expecting 40 hex digits)\n"
+msgstr "Not a valid keygrip (expecting 40 hex digits)\n"
+
+#: g10/keygen.c:2018 sm/certreqgen-ui.c:216
+msgid "No key with this keygrip\n"
+msgstr "No key with this keygrip\n"
+
+#: g10/keygen.c:2092 g10/keygen.c:2106
+#, c-format
+msgid "rounded to %u bits\n"
+msgstr "rounded to %u bits\n"
+
+#: g10/keygen.c:2147
+#, 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:2155
+#, 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:2158 sm/certreqgen-ui.c:183
+#, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "What keysize do you want? (%u) "
+
+#: g10/keygen.c:2172 sm/certreqgen-ui.c:193
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Requested keysize is %u bits\n"
+
+#: g10/keygen.c:2217
+msgid "Please select which elliptic curve you want:\n"
+msgstr "Please select which elliptic curve you want:\n"
+
+#: g10/keygen.c:2382
+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:2393
+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:2416
+msgid "Key is valid for? (0) "
+msgstr "Key is valid for? (0) "
+
+#: g10/keygen.c:2421
+#, c-format
+msgid "Signature is valid for? (%s) "
+msgstr "Signature is valid for? (%s) "
+
+#: g10/keygen.c:2440 g10/keygen.c:2465
+msgid "invalid value\n"
+msgstr "invalid value\n"
+
+#: g10/keygen.c:2447
+msgid "Key does not expire at all\n"
+msgstr "Key does not expire at all\n"
+
+#: g10/keygen.c:2448
+msgid "Signature does not expire at all\n"
+msgstr "Signature does not expire at all\n"
+
+#: g10/keygen.c:2453
+#, c-format
+msgid "Key expires at %s\n"
+msgstr "Key expires at %s\n"
+
+#: g10/keygen.c:2454
+#, c-format
+msgid "Signature expires at %s\n"
+msgstr "Signature expires at %s\n"
+
+#: g10/keygen.c:2458
+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:2471
+msgid "Is this correct? (y/N) "
+msgstr "Is this correct? (y/N) "
+
+#: g10/keygen.c:2539
+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:2554
+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:2573
+msgid "Real name: "
+msgstr "Real name: "
+
+#: g10/keygen.c:2582
+msgid "Invalid character in name\n"
+msgstr "Invalid character in name\n"
+
+#: g10/keygen.c:2583
+#, 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:2587
+msgid "Name may not start with a digit\n"
+msgstr "Name may not start with a digit\n"
+
+#: g10/keygen.c:2590
+msgid "Name must be at least 5 characters long\n"
+msgstr "Name must be at least 5 characters long\n"
+
+#: g10/keygen.c:2600
+msgid "Email address: "
+msgstr "Email address: "
+
+#: g10/keygen.c:2606
+msgid "Not a valid email address\n"
+msgstr "Not a valid email address\n"
+
+#: g10/keygen.c:2615
+msgid "Comment: "
+msgstr "Comment: "
+
+#: g10/keygen.c:2621
+msgid "Invalid character in comment\n"
+msgstr "Invalid character in comment\n"
+
+#: g10/keygen.c:2657
+#, c-format
+msgid "You are using the '%s' character set.\n"
+msgstr "You are using the ‘%s’ character set.\n"
+
+#: g10/keygen.c:2663
+#, 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:2668
+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:2693
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoQq"
+
+#: g10/keygen.c:2703
+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:2704
+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:2709
+msgid "Change (N)ame, (E)mail, or (Q)uit? "
+msgstr "Change (N)ame, (E)mail, or (Q)uit? "
+
+#: g10/keygen.c:2710
+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:2729
+msgid "Please correct the error first\n"
+msgstr "Please correct the error first\n"
+
+#: g10/keygen.c:2775
+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:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
+#: g10/keygen.c:4791
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Key generation failed: %s\n"
+
+#: g10/keygen.c:3577
+#, 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:3579
+msgid "Continue? (Y/n) "
+msgstr "Continue? (Y/n) "
+
+#: g10/keygen.c:3600
+#, c-format
+msgid "A key for \"%s\" already exists\n"
+msgstr "A key for “%s” already exists\n"
+
+#: g10/keygen.c:3605
+msgid "Create anyway? (y/N) "
+msgstr "Create anyway? (y/N) "
+
+#: g10/keygen.c:3610
+msgid "creating anyway\n"
+msgstr "creating anyway\n"
+
+#: g10/keygen.c:3904
+#, 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:3936
+msgid "Key generation canceled.\n"
+msgstr "Key generation canceled.\n"
+
+#: g10/keygen.c:3996
+#, c-format
+msgid "can't create backup file '%s': %s\n"
+msgstr "can't create backup file '%s': %s\n"
+
+#: g10/keygen.c:4016
+#, 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:4167 g10/keygen.c:4315
+#, c-format
+msgid "writing public key to '%s'\n"
+msgstr "writing public key to ‘%s’\n"
+
+#: g10/keygen.c:4309
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "no writable public keyring found: %s\n"
+
+#: g10/keygen.c:4323
+#, c-format
+msgid "error writing public keyring '%s': %s\n"
+msgstr "error writing public keyring '%s': %s\n"
+
+#: g10/keygen.c:4355
+msgid "public and secret key created and signed.\n"
+msgstr "public and secret key created and signed.\n"
+
+#: g10/keygen.c:4367
+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:4567 g10/keygen.c:4741
+#, 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:4569 g10/keygen.c:4743
+#, 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:4580 g10/keygen.c:4754
+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:4592 g10/keygen.c:4594
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Secret parts of primary key are not available.\n"
+
+#: g10/keygen.c:4601 g10/keygen.c:4603
+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:4622 g10/keygen.c:4769
+msgid "Really create? (y/N) "
+msgstr "Really create? (y/N) "
+
+#: g10/keyid.c:662 g10/keyid.c:675 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:375
+msgid "Critical preferred keyserver: "
+msgstr "Critical preferred keyserver: "
+
+#: g10/keylist.c:428
+msgid "Critical signature notation: "
+msgstr "Critical signature notation: "
+
+#: g10/keylist.c:430
+msgid "Signature notation: "
+msgstr "Signature notation: "
+
+#: g10/keylist.c:472
+#, c-format
+msgid "%d good signature\n"
+msgid_plural "%d good signatures\n"
+msgstr[0] "%d good signature\n"
+msgstr[1] "%d good signatures\n"
+
+#: g10/keylist.c:485
+#, c-format
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "%d signature not checked due to an error\n"
+msgstr[1] "%d signatures not checked due to errors\n"
+
+#: g10/keylist.c:567
+#, c-format
+msgid "Warning: %lu key skipped due to its large size\n"
+msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
+msgstr[0] "Warning: %lu key skipped due to its large size\n"
+msgstr[1] "Warning: %lu keys skipped due to their large sizes\n"
+
+#: g10/keylist.c:589
+msgid "Keyring"
+msgstr "Keyring"
+
+#: g10/keylist.c:1710
+msgid "Primary key fingerprint:"
+msgstr "Primary key fingerprint:"
+
+#: g10/keylist.c:1712
+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:1720
+msgid " Primary key fingerprint:"
+msgstr " Primary key fingerprint:"
+
+#: g10/keylist.c:1722 g10/keylist.c:1732
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
+#: g10/keylist.c:1727 g10/keylist.c:1743
+msgid " Key fingerprint ="
+msgstr " Key fingerprint ="
+
+#: g10/keylist.c:1794
+msgid " Card serial no. ="
+msgstr " Card serial no. ="
+
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
+#, c-format
+msgid "caching keyring '%s'\n"
+msgstr "caching keyring ‘%s’\n"
+
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
+#, c-format
+msgid "%lu keys cached so far (%lu signature)\n"
+msgid_plural "%lu keys cached so far (%lu signatures)\n"
+msgstr[0] "%lu keys cached so far (%lu signature)\n"
+msgstr[1] "%lu keys cached so far (%lu signatures)\n"
+
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
+#, c-format
+msgid "%lu key cached"
+msgid_plural "%lu keys cached"
+msgstr[0] "%lu key cached"
+msgstr[1] "%lu keys cached"
+
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
+#, c-format
+msgid " (%lu signature)\n"
+msgid_plural " (%lu signatures)\n"
+msgstr[0] " (%lu signature)\n"
+msgstr[1] " (%lu signatures)\n"
+
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: keyring created\n"
+
+#: g10/keyserver.c:90
+msgid "override proxy options set for dirmngr"
+msgstr "override proxy options set for dirmngr"
+
+#: g10/keyserver.c:92
+msgid "include revoked keys in search results"
+msgstr "include revoked keys in search results"
+
+#: g10/keyserver.c:93
+msgid "include subkeys when searching by key ID"
+msgstr "include subkeys when searching by key ID"
+
+#: g10/keyserver.c:95
+msgid "override timeout options set for dirmngr"
+msgstr "override timeout options set for dirmngr"
+
+#: g10/keyserver.c:99
+msgid "automatically retrieve keys when verifying signatures"
+msgstr "automatically retrieve keys when verifying signatures"
+
+#: g10/keyserver.c:101
+msgid "honor the preferred keyserver URL set on the key"
+msgstr "honor the preferred keyserver URL set on the key"
+
+#: g10/keyserver.c:103
+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:548
+msgid "disabled"
+msgstr "disabled"
+
+#: g10/keyserver.c:752
+msgid "Enter number(s), N)ext, or Q)uit > "
+msgstr "Enter number(s), N)ext, or Q)uit > "
+
+#: g10/keyserver.c:858
+#, c-format
+msgid "invalid keyserver protocol (us %d!=handler %d)\n"
+msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
+
+#: g10/keyserver.c:999 g10/keyserver.c:1114
+#, c-format
+msgid "\"%s\" not a key ID: skipping\n"
+msgstr "“%s” not a key ID: skipping\n"
+
+#: g10/keyserver.c:1419 g10/keyserver.c:1452
+#, 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:1426
+#, 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:1530
+#, c-format
+msgid "key \"%s\" not found on keyserver\n"
+msgstr "key “%s” not found on keyserver\n"
+
+#: g10/keyserver.c:1533
+msgid "key not found on keyserver\n"
+msgstr "key not found on keyserver\n"
+
+#: g10/keyserver.c:1537
+msgid "no keyserver known (use option --keyserver)\n"
+msgstr "no keyserver known (use option --keyserver)\n"
+
+#: g10/keyserver.c:1701
+#, c-format
+msgid "requesting key %s from %s server %s\n"
+msgstr "requesting key %s from %s server %s\n"
+
+#: g10/keyserver.c:1705
+#, c-format
+msgid "requesting key %s from %s\n"
+msgstr "requesting key %s from %s\n"
+
+#: g10/keyserver.c:1805 g10/keyserver.c:1960
+msgid "no keyserver known\n"
+msgstr "no keyserver known\n"
+
+#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+#, c-format
+msgid "skipped \"%s\": %s\n"
+msgstr "skipped “%s”: %s\n"
+
+#: g10/keyserver.c:1823
+#, c-format
+msgid "sending key %s to %s\n"
+msgstr "sending key %s to %s\n"
+
+#: g10/keyserver.c:1864
+#, c-format
+msgid "requesting key from '%s'\n"
+msgstr "requesting key from ‘%s’\n"
+
+#: g10/keyserver.c:1880
+#, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "WARNING: unable to fetch URI %s: %s\n"
+
+#: g10/mainproc.c:254
+#, c-format
+msgid "weird size for an encrypted session key (%d)\n"
+msgstr "weird size for an encrypted session key (%d)\n"
+
+#: g10/mainproc.c:302
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s encrypted session key\n"
+
+#: g10/mainproc.c:312
+#, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "passphrase generated with unknown digest algorithm %d\n"
+
+#: g10/mainproc.c:378
+#, c-format
+msgid "public key is %s\n"
+msgstr "public key is %s\n"
+
+#: g10/mainproc.c:456
+msgid "public key encrypted data: good DEK\n"
+msgstr "public key encrypted data: good DEK\n"
+
+#: g10/mainproc.c:489
+#, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+msgstr "encrypted with %u-bit %s key, ID %s, created %s\n"
+
+#: g10/mainproc.c:493 g10/pkclist.c:228
+#, c-format
+msgid " \"%s\"\n"
+msgstr " “%s”\n"
+
+#: g10/mainproc.c:497
+#, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "encrypted with %s key, ID %s\n"
+
+#: g10/mainproc.c:514
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "public key decryption failed: %s\n"
+
+#: g10/mainproc.c:530
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "encrypted with %lu passphrases\n"
+
+#: g10/mainproc.c:532
+msgid "encrypted with 1 passphrase\n"
+msgstr "encrypted with 1 passphrase\n"
+
+#: g10/mainproc.c:566 g10/mainproc.c:587
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "assuming %s encrypted data\n"
+
+#: g10/mainproc.c:573
+#, c-format
+msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
+msgstr "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
+
+#: g10/mainproc.c:618 g10/mainproc.c:632
+msgid "WARNING: message was not integrity protected\n"
+msgstr "WARNING: message was not integrity protected\n"
+
+#: g10/mainproc.c:628
+msgid "decryption okay\n"
+msgstr "decryption okay\n"
+
+#: g10/mainproc.c:637
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "WARNING: encrypted message has been manipulated!\n"
+
+#: g10/mainproc.c:653
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "decryption failed: %s\n"
+
+#: g10/mainproc.c:676
+msgid "Note: sender requested \"for-your-eyes-only\"\n"
+msgstr "Note: sender requested “for-your-eyes-only”\n"
+
+#: g10/mainproc.c:678
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "original file name='%.*s'\n"
+
+#: g10/mainproc.c:748
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr "WARNING: multiple plaintexts seen\n"
+
+#: g10/mainproc.c:914
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr "standalone revocation - use “gpg --import” to apply\n"
+
+#: g10/mainproc.c:1214 g10/mainproc.c:1257
+msgid "no signature found\n"
+msgstr "no signature found\n"
+
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "BAD signature from “%s”"
+
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Expired signature from “%s”"
+
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Good signature from “%s”"
+
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
+msgid "signature verification suppressed\n"
+msgstr "signature verification suppressed\n"
+
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
+msgid "can't handle this ambiguous signature data\n"
+msgstr "can't handle this ambiguous signature data\n"
+
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
+#, c-format
+msgid "Signature made %s\n"
+msgstr "Signature made %s\n"
+
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
+#, c-format
+msgid " using %s key %s\n"
+msgstr " using %s key %s\n"
+
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
+#, 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:1744
++#: g10/mainproc.c:1755
++#, c-format
++msgid " issuer \"%s\"\n"
++msgstr " issuer “%s”\n"
++
++#: g10/mainproc.c:1772
+msgid "Key available at: "
+msgstr "Key available at: "
+
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
+msgid "[uncertain]"
+msgstr "[uncertain]"
+
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
+#, c-format
+msgid " aka \"%s\""
+msgstr " aka “%s”"
+
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Signature expired %s\n"
+
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Signature expires %s\n"
+
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
+#, c-format
+msgid "%s signature, digest algorithm %s%s%s\n"
+msgstr "%s signature, digest algorithm %s%s%s\n"
+
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
+msgid "binary"
+msgstr "binary"
+
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
+msgid "textmode"
+msgstr "textmode"
+
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
+msgid "unknown"
+msgstr "unknown"
+
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
+msgid ", key algorithm "
+msgstr ", key algorithm "
+
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
+#, 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:2189
++#: g10/mainproc.c:2217
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Can't check signature: %s\n"
+
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
+msgid "not a detached signature\n"
+msgstr "not a detached signature\n"
+
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
+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:2339
++#: g10/mainproc.c:2367
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "standalone signature of class 0x%02x\n"
+
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
+msgid "old style (PGP 2.x) signature\n"
+msgstr "old style (PGP 2.x) signature\n"
+
+#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
+#, c-format
+msgid "fstat of '%s' failed in %s: %s\n"
+msgstr "fstat of ‘%s’ failed in %s: %s\n"
+
+#: g10/misc.c:170
+#, c-format
+msgid "fstat(%d) failed in %s: %s\n"
+msgstr "fstat(%d) failed in %s: %s\n"
+
+#: g10/misc.c:279
+#, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr "WARNING: using experimental public key algorithm %s\n"
+
+#: g10/misc.c:286
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+
+#: g10/misc.c:300
+#, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "WARNING: using experimental cipher algorithm %s\n"
+
+#: g10/misc.c:319
+#, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "WARNING: using experimental digest algorithm %s\n"
+
+#: g10/misc.c:328
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "WARNING: digest algorithm %s is deprecated\n"
+
+#: g10/misc.c:353
+#, c-format
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "Note: signatures using the %s algorithm are rejected\n"
+
+#: g10/misc.c:375
+#, c-format
+msgid "(reported error: %s)\n"
+msgstr "(reported error: %s)\n"
+
+#: g10/misc.c:378
+#, c-format
+msgid "(reported error: %s <%s>)\n"
+msgstr "(reported error: %s <%s>)\n"
+
+#: g10/misc.c:397
+msgid "(further info: "
+msgstr "(further info: "
+
+#: g10/misc.c:1056
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: deprecated option “%s”\n"
+
+#: g10/misc.c:1060
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNING: “%s” is a deprecated option\n"
+
+#: g10/misc.c:1062
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "please use “%s%s” instead\n"
+
+#: g10/misc.c:1069
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "WARNING: “%s” is a deprecated command - do not use it\n"
+
+#: g10/misc.c:1079
+#, c-format
+msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "%s:%u: “%s” is obsolete in this file - it only has effect in %s\n"
+
+#: g10/misc.c:1083
+#, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr ""
+"WARNING: “%s%s” is an obsolete option - it has no effect except on %s\n"
+
+#: g10/misc.c:1147
+msgid "Uncompressed"
+msgstr "Uncompressed"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:1172
+msgid "uncompressed|none"
+msgstr "uncompressed|none"
+
+#: g10/misc.c:1292
+#, 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:1467
+#, c-format
+msgid "ambiguous option '%s'\n"
+msgstr "ambiguous option ‘%s’\n"
+
+#: g10/misc.c:1492
+#, c-format
+msgid "unknown option '%s'\n"
+msgstr "unknown option ‘%s’\n"
+
+#: g10/misc.c:1730
+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:1752
+#, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "unknown weak digest ‘%s’\n"
+
+#: g10/openfile.c:84
+#, c-format
+msgid "File '%s' exists. "
+msgstr "File ‘%s’ exists. "
+
+#: g10/openfile.c:88
+msgid "Overwrite? (y/N) "
+msgstr "Overwrite? (y/N) "
+
+#: g10/openfile.c:123
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: unknown suffix\n"
+
+#: g10/openfile.c:147
+msgid "Enter new filename"
+msgstr "Enter new filename"
+
+#: g10/openfile.c:218
+msgid "writing to stdout\n"
+msgstr "writing to stdout\n"
+
+#: g10/openfile.c:366
+#, c-format
+msgid "assuming signed data in '%s'\n"
+msgstr "assuming signed data in ‘%s’\n"
+
+#: g10/openfile.c:457
+#, c-format
+msgid "new configuration file '%s' created\n"
+msgstr "new configuration file ‘%s’ created\n"
+
+#: g10/openfile.c:498
+#, c-format
+msgid "WARNING: options in '%s' are not yet active during this run\n"
+msgstr "WARNING: options in ‘%s’ are not yet active during this run\n"
+
+#: g10/parse-packet.c:257
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "can't handle public key algorithm %d\n"
+
+#: g10/parse-packet.c:1113
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
+
+#: g10/parse-packet.c:1649
+#, c-format
+msgid "subpacket of type %d has critical bit set\n"
+msgstr "subpacket of type %d has critical bit set\n"
+
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
+#, c-format
+msgid "problem with the agent: %s\n"
+msgstr "problem with the agent: %s\n"
+
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, c-format
- msgid " (main key ID %s)"
- msgstr " (main key ID %s)"
-
- #: g10/passphrase.c:277
- #, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "“%.*s”\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
+msgid "Enter passphrase\n"
+msgstr "Enter passphrase\n"
+
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
+msgid "cancelled by user\n"
+msgstr "cancelled by user\n"
+
- #: g10/passphrase.c:483
- #, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "You need a passphrase to unlock the secret key for\n"
- "user: “%s”\n"
-
- #: g10/passphrase.c:491
- #, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%u-bit %s key, ID %s, created %s"
-
- #: g10/passphrase.c:500
++#: g10/passphrase.c:489
+#, c-format
- msgid " (subkey on main key ID %s)"
- msgstr " (subkey on main key ID %s)"
++msgid " (main key ID %s)"
++msgstr " (main key ID %s)"
+
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
+msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
+msgstr "Please enter the passphrase to unlock the OpenPGP secret key:"
+
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
+msgid "Please enter the passphrase to import the OpenPGP secret key:"
+msgstr "Please enter the passphrase to import the OpenPGP secret key:"
+
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
+msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
+msgstr "Please enter the passphrase to export the OpenPGP secret subkey:"
+
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
+msgid "Please enter the passphrase to export the OpenPGP secret key:"
+msgstr "Please enter the passphrase to export the OpenPGP secret key:"
+
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
+msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
+msgstr ""
+"Do you really want to permanently delete the OpenPGP secret subkey key:"
+
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
+msgid "Do you really want to permanently delete the OpenPGP secret key:"
+msgstr "Do you really want to permanently delete the OpenPGP secret key:"
+
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
+#, c-format
+msgid ""
+"%s\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %s,\n"
+"created %s%s.\n"
+"%s"
+msgstr ""
+"%s\n"
+"“%.*s”\n"
+"%u-bit %s key, ID %s,\n"
+"created %s%s.\n"
+"%s"
+
+#: g10/photoid.c:77
+msgid ""
+"\n"
+"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key. If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key. If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+
+#: g10/photoid.c:99
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Enter JPEG filename for photo ID: "
+
+#: g10/photoid.c:120
+#, c-format
+msgid "unable to open JPEG file '%s': %s\n"
+msgstr "unable to open JPEG file '%s': %s\n"
+
+#: g10/photoid.c:131
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr "This JPEG is really large (%d bytes) !\n"
+
+#: g10/photoid.c:133
+msgid "Are you sure you want to use it? (y/N) "
+msgstr "Are you sure you want to use it? (y/N) "
+
+#: g10/photoid.c:149
+#, c-format
+msgid "'%s' is not a JPEG file\n"
+msgstr "‘%s’ is not a JPEG file\n"
+
+#: g10/photoid.c:168
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Is this photo correct (y/N/q)? "
+
+#: g10/photoid.c:380
+msgid "unable to display photo ID!\n"
+msgstr "unable to display photo ID!\n"
+
+#: g10/pkclist.c:72 g10/revoke.c:757
+msgid "No reason specified"
+msgstr "No reason specified"
+
+#: g10/pkclist.c:74 g10/revoke.c:759
+msgid "Key is superseded"
+msgstr "Key is superseded"
+
+#: g10/pkclist.c:76 g10/revoke.c:758
+msgid "Key has been compromised"
+msgstr "Key has been compromised"
+
+#: g10/pkclist.c:78 g10/revoke.c:760
+msgid "Key is no longer used"
+msgstr "Key is no longer used"
+
+#: g10/pkclist.c:80 g10/revoke.c:761
+msgid "User ID is no longer valid"
+msgstr "User ID is no longer valid"
+
+#: g10/pkclist.c:84
+msgid "reason for revocation: "
+msgstr "reason for revocation: "
+
+#: g10/pkclist.c:100
+msgid "revocation comment: "
+msgstr "revocation comment: "
+
+#. TRANSLATORS: These are the allowed answers in lower and
+#. uppercase. Below you will find the matching strings which
+#. should be translated accordingly and the letter changed to
+#. match the one in the answer string.
+#.
+#. i = please show me more information
+#. m = back to the main menu
+#. s = skip this key
+#. q = quit
+#.
+#: g10/pkclist.c:216
+msgid "iImMqQsS"
+msgstr "iImMqQsS"
+
+#: g10/pkclist.c:224
+msgid "No trust value assigned to:\n"
+msgstr "No trust value assigned to:\n"
+
+#: g10/pkclist.c:257
+#, c-format
+msgid " aka \"%s\"\n"
+msgstr " aka “%s”\n"
+
+#: g10/pkclist.c:267
+msgid ""
+"How much do you trust that this key actually belongs to the named user?\n"
+msgstr ""
+"How much do you trust that this key actually belongs to the named user?\n"
+
+#: g10/pkclist.c:282
+#, c-format
+msgid " %d = I don't know or won't say\n"
+msgstr " %d = I don't know or won't say\n"
+
+#: g10/pkclist.c:284
+#, c-format
+msgid " %d = I do NOT trust\n"
+msgstr " %d = I do NOT trust\n"
+
+#: g10/pkclist.c:290
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr " %d = I trust ultimately\n"
+
+#: g10/pkclist.c:296
+msgid " m = back to the main menu\n"
+msgstr " m = back to the main menu\n"
+
+#: g10/pkclist.c:299
+msgid " s = skip this key\n"
+msgstr " s = skip this key\n"
+
+#: g10/pkclist.c:300
+msgid " q = quit\n"
+msgstr " q = quit\n"
+
+#: g10/pkclist.c:304
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+
+#: g10/pkclist.c:310 g10/revoke.c:786
+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:476
+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:495
+msgid "Use this key anyway? (y/N) "
+msgstr "Use this key anyway? (y/N) "
+
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
+msgid "WARNING: Using untrusted key!\n"
+msgstr "WARNING: Using untrusted key!\n"
+
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
+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:561
++#: g10/pkclist.c:565
+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:564
++#: g10/pkclist.c:568
+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:565
++#: g10/pkclist.c:569
+msgid " This could mean that the signature is forged.\n"
+msgstr " This could mean that the signature is forged.\n"
+
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
+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:576
++#: g10/pkclist.c:580
+msgid "Note: This key has been disabled.\n"
+msgstr "Note: This key has been disabled.\n"
+
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
+#, c-format
+msgid "Note: Verified signer's address is '%s'\n"
+msgstr "Note: Verified signer's address is ‘%s’\n"
+
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
+#, 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:615
++#: g10/pkclist.c:619
+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:623
++#: g10/pkclist.c:627
+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:634
++#: g10/pkclist.c:638
+msgid "Note: This key has expired!\n"
+msgstr "Note: This key has expired!\n"
+
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
+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:647
++#: g10/pkclist.c:651
+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:655
++#: g10/pkclist.c:659
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "WARNING: We do NOT trust this key!\n"
+
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
+msgid " The signature is probably a FORGERY.\n"
+msgstr " The signature is probably a FORGERY.\n"
+
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
+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:666
++#: g10/pkclist.c:670
+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:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: skipped: %s\n"
+
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: skipped: public key is disabled\n"
+
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: skipped: public key already present\n"
+
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
+#, c-format
+msgid "can't encrypt to '%s'\n"
+msgstr "can't encrypt to ‘%s’\n"
+
- #: g10/pkclist.c:984
++#: g10/pkclist.c:988
+#, 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:991
++#: g10/pkclist.c:995
+#, 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:1094
++#: g10/pkclist.c:1098
+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:1118
++#: g10/pkclist.c:1122
+msgid "Current recipients:\n"
+msgstr "Current recipients:\n"
+
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
+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:1168
++#: g10/pkclist.c:1172
+msgid "No such user ID.\n"
+msgstr "No such user ID.\n"
+
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
+msgid "skipped: public key already set as default recipient\n"
+msgstr "skipped: public key already set as default recipient\n"
+
- #: g10/pkclist.c:1200
++#: g10/pkclist.c:1204
+msgid "Public key is disabled.\n"
+msgstr "Public key is disabled.\n"
+
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
+msgid "skipped: public key already set\n"
+msgstr "skipped: public key already set\n"
+
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
+#, c-format
+msgid "unknown default recipient \"%s\"\n"
+msgstr "unknown default recipient “%s”\n"
+
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
+msgid "no valid addressees\n"
+msgstr "no valid addressees\n"
+
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
+#, c-format
+msgid "Note: key %s has no %s feature\n"
+msgstr "Note: key %s has no %s feature\n"
+
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
+#, c-format
+msgid "Note: key %s has no preference for %s\n"
+msgstr "Note: key %s has no preference for %s\n"
+
+#: g10/plaintext.c:84
+msgid "data not saved; use option \"--output\" to save it\n"
+msgstr "data not saved; use option “--output” to save it\n"
+
+#: g10/plaintext.c:598
+msgid "Detached signature.\n"
+msgstr "Detached signature.\n"
+
+#: g10/plaintext.c:606
+msgid "Please enter name of data file: "
+msgstr "Please enter name of data file: "
+
+#: g10/plaintext.c:643
+msgid "reading stdin ...\n"
+msgstr "reading stdin ...\n"
+
+#: g10/plaintext.c:688
+msgid "no signed data\n"
+msgstr "no signed data\n"
+
+#: g10/plaintext.c:706
+#, c-format
+msgid "can't open signed data '%s'\n"
+msgstr "can't open signed data ‘%s’\n"
+
+#: g10/plaintext.c:741
+#, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "can't open signed data fd=%d: %s\n"
+
+#: g10/pubkey-enc.c:116
+#, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonymous recipient; trying secret key %s ...\n"
+
+#: g10/pubkey-enc.c:123
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "okay, we are the anonymous recipient.\n"
+
+#: g10/pubkey-enc.c:282
+msgid "old encoding of the DEK is not supported\n"
+msgstr "old encoding of the DEK is not supported\n"
+
+#: g10/pubkey-enc.c:310
+#, c-format
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr "cipher algorithm %d%s is unknown or disabled\n"
+
+#: g10/pubkey-enc.c:352
+#, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
+msgstr "WARNING: cipher algorithm %s not found in recipient preferences\n"
+
+#: g10/pubkey-enc.c:377
+#, c-format
+msgid "Note: secret key %s expired at %s\n"
+msgstr "Note: secret key %s expired at %s\n"
+
+#: g10/pubkey-enc.c:384
+msgid "Note: key has been revoked"
+msgstr "Note: key has been revoked"
+
+#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
+#: g10/revoke.c:500
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet failed: %s\n"
+
+#: g10/revoke.c:144
+#, c-format
+msgid "key %s has no user IDs\n"
+msgstr "key %s has no user IDs\n"
+
+#: g10/revoke.c:312
+msgid "To be revoked by:\n"
+msgstr "To be revoked by:\n"
+
+#: g10/revoke.c:316
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(This is a sensitive revocation key)\n"
+
+#: g10/revoke.c:322
+msgid "Secret key is not available.\n"
+msgstr "Secret key is not available.\n"
+
+#: g10/revoke.c:327
+msgid "Create a designated revocation certificate for this key? (y/N) "
+msgstr "Create a designated revocation certificate for this key? (y/N) "
+
+#: g10/revoke.c:336 g10/revoke.c:727
+msgid "ASCII armored output forced.\n"
+msgstr "ASCII armored output forced.\n"
+
+#: g10/revoke.c:352 g10/revoke.c:479
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet failed: %s\n"
+
+#: g10/revoke.c:415
+msgid "Revocation certificate created.\n"
+msgstr "Revocation certificate created.\n"
+
+#: g10/revoke.c:421
+#, c-format
+msgid "no revocation keys found for \"%s\"\n"
+msgstr "no revocation keys found for “%s”\n"
+
+#: g10/revoke.c:551
+msgid "This is a revocation certificate for the OpenPGP key:"
+msgstr "This is a revocation certificate for the OpenPGP key:"
+
+#: g10/revoke.c:567
+msgid ""
+"A revocation certificate is a kind of \"kill switch\" to publicly\n"
+"declare that a key shall not anymore be used. It is not possible\n"
+"to retract such a revocation certificate once it has been published."
+msgstr ""
+"A revocation certificate is a kind of “kill switch” to publicly\n"
+"declare that a key shall not anymore be used. It is not possible\n"
+"to retract such a revocation certificate once it has been published."
+
+#: g10/revoke.c:570
+msgid ""
+"Use it to revoke this key in case of a compromise or loss of\n"
+"the secret key. However, if the secret key is still accessible,\n"
+"it is better to generate a new revocation certificate and give\n"
+"a reason for the revocation. For details see the description of\n"
+"of the gpg command \"--gen-revoke\" in the GnuPG manual."
+msgstr ""
+"Use it to revoke this key in case of a compromise or loss of\n"
+"the secret key. However, if the secret key is still accessible,\n"
+"it is better to generate a new revocation certificate and give\n"
+"a reason for the revocation. For details see the description of\n"
+"of the gpg command “--gen-revoke” in the GnuPG manual."
+
+#: g10/revoke.c:575
+msgid ""
+"To avoid an accidental use of this file, a colon has been inserted\n"
+"before the 5 dashes below. Remove this colon with a text editor\n"
+"before importing and publishing this revocation certificate."
+msgstr ""
+"To avoid an accidental use of this file, a colon has been inserted\n"
+"before the 5 dashes below. Remove this colon with a text editor\n"
+"before importing and publishing this revocation certificate."
+
+#: g10/revoke.c:590
+#, c-format
+msgid "revocation certificate stored as '%s.rev'\n"
+msgstr "revocation certificate stored as ‘%s.rev’\n"
+
+#: g10/revoke.c:634
+#, c-format
+msgid "secret key \"%s\" not found\n"
+msgstr "secret key “%s” not found\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line. Several lines
+#. lines with secret key infos are printed after this message.
+#: g10/revoke.c:661
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr "‘%s’ matches multiple secret keys:\n"
+
+#: g10/revoke.c:688
+#, c-format
+msgid "error searching the keyring: %s\n"
+msgstr "error searching the keyring: %s\n"
+
+#: g10/revoke.c:711
+msgid "Create a revocation certificate for this key? (y/N) "
+msgstr "Create a revocation certificate for this key? (y/N) "
+
+#: g10/revoke.c:735
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable. But have some caution: The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable. But have some caution: The print system of\n"
+"your machine might store the data and make it available to others!\n"
+
+#: g10/revoke.c:769
+msgid "Please select the reason for the revocation:\n"
+msgstr "Please select the reason for the revocation:\n"
+
+#: g10/revoke.c:779
+msgid "Cancel"
+msgstr "Cancel"
+
+#: g10/revoke.c:781
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Probably you want to select %d here)\n"
+
+#: g10/revoke.c:822
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Enter an optional description; end it with an empty line:\n"
+
+#: g10/revoke.c:850
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Reason for revocation: %s\n"
+
+#: g10/revoke.c:852
+msgid "(No description given)\n"
+msgstr "(No description given)\n"
+
+#: g10/revoke.c:857
+msgid "Is this okay? (y/N) "
+msgstr "Is this okay? (y/N) "
+
+#: g10/seskey.c:62 sm/encrypt.c:123
+msgid "weak key created - retrying\n"
+msgstr "weak key created - retrying\n"
+
+#: g10/seskey.c:66
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+msgstr "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+
+#: g10/seskey.c:306
+#, c-format
+msgid "%s key %s uses an unsafe (%zu bit) hash\n"
+msgstr "%s key %s uses an unsafe (%zu bit) hash\n"
+
+#: g10/seskey.c:324
+#, c-format
+msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
+msgstr "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
+
+#: g10/sig-check.c:116
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "WARNING: signature digest conflict in message\n"
+
+#: g10/sig-check.c:143
+#, 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:145
+#, c-format
+msgid "please see %s for more information\n"
+msgstr "please see %s for more information\n"
+
+#: g10/sig-check.c:155
+#, 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:277
+#, 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:286
+#, 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:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
+#, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgid_plural ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr[0] ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr[1] ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+
+#: g10/sig-check.c:309
+#, 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:326
+#, c-format
+msgid "Note: signature key %s expired %s\n"
+msgstr "Note: signature key %s expired %s\n"
+
+#: g10/sig-check.c:337
+#, c-format
+msgid "Note: signature key %s has been revoked\n"
+msgstr "Note: signature key %s has been revoked\n"
+
+#: g10/sig-check.c:471
+#, 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:1048
+#, 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:1051
+#, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "key %s: no subkey for subkey binding signature\n"
+
+#: g10/sign.c:88
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+
+#: g10/sign.c:114
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
+
+#: g10/sign.c:137
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
+"unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
+"unexpanded.\n"
+
- #: g10/sign.c:314
++#: g10/sign.c:329
+#, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s/%s signature from: “%s”\n"
+
- #: g10/sign.c:863
++#: g10/sign.c:878
+#, 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:994
++#: g10/sign.c:1009
+msgid "signing:"
+msgstr "signing:"
+
- #: g10/sign.c:1271
++#: g10/sign.c:1286
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s encryption will be used\n"
+
+#: g10/skclist.c:155 g10/skclist.c:236
+msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+msgstr "key is not flagged as insecure - can't use it with the faked RNG!\n"
+
+#: g10/skclist.c:187
+#, c-format
+msgid "skipped \"%s\": duplicated\n"
+msgstr "skipped “%s”: duplicated\n"
+
+#: g10/skclist.c:206
+msgid "skipped: secret key already present\n"
+msgstr "skipped: secret key already present\n"
+
+#: g10/skclist.c:225
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
+msgstr ""
+"this is a PGP generated Elgamal key which is not secure for signatures!"
+
+#: g10/tdbdump.c:57 g10/trustdb.c:361
+#, c-format
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr "trust record %lu, type %d: write failed: %s\n"
+
+#: g10/tdbdump.c:105
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use “gpg --import-ownertrust” to restore them)\n"
+
+#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
+#, c-format
+msgid "error in '%s': %s\n"
+msgstr "error in '%s': %s\n"
+
+#: g10/tdbdump.c:162
+msgid "line too long"
+msgstr "line too long"
+
+#: g10/tdbdump.c:170
+msgid "colon missing"
+msgstr "colon missing"
+
+#: g10/tdbdump.c:176
+msgid "invalid fingerprint"
+msgstr "invalid fingerprint"
+
+#: g10/tdbdump.c:181
+msgid "ownertrust value missing"
+msgstr "ownertrust value missing"
+
+#: g10/tdbdump.c:217
+#, c-format
+msgid "error finding trust record in '%s': %s\n"
+msgstr "error finding trust record in '%s': %s\n"
+
+#: g10/tdbdump.c:221
+#, c-format
+msgid "read error in '%s': %s\n"
+msgstr "read error in '%s': %s\n"
+
+#: g10/tdbdump.c:230 g10/trustdb.c:376
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "trustdb: sync failed: %s\n"
+
+#: g10/tdbio.c:141 sm/keydb.c:355
+#, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "can't create lock for ‘%s’\n"
+
+#: g10/tdbio.c:146
+#, c-format
+msgid "can't lock '%s'\n"
+msgstr "can't lock ‘%s’\n"
+
+#: g10/tdbio.c:205 g10/tdbio.c:1787
+#, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr "trustdb rec %lu: lseek failed: %s\n"
+
+#: g10/tdbio.c:213 g10/tdbio.c:1798
+#, c-format
+msgid "trustdb rec %lu: write failed (n=%d): %s\n"
+msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
+
+#: g10/tdbio.c:352
+msgid "trustdb transaction too large\n"
+msgstr "trustdb transaction too large\n"
+
+#: g10/tdbio.c:682
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: directory does not exist!\n"
+
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
+#, c-format
+msgid "can't access '%s': %s\n"
+msgstr "can't access '%s': %s\n"
+
+#: g10/tdbio.c:724
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: failed to create version record: %s"
+
+#: g10/tdbio.c:729
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: invalid trustdb created\n"
+
+#: g10/tdbio.c:732
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: trustdb created\n"
+
+#: g10/tdbio.c:788
+msgid "Note: trustdb not writable\n"
+msgstr "Note: trustdb not writable\n"
+
+#: g10/tdbio.c:797
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: invalid trustdb\n"
+
+#: g10/tdbio.c:834
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: failed to create hashtable: %s\n"
+
+#: g10/tdbio.c:842
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: error updating version record: %s\n"
+
+#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
+#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: error reading version record: %s\n"
+
+#: g10/tdbio.c:938
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: error writing version record: %s\n"
+
+#: g10/tdbio.c:1461
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "trustdb: lseek failed: %s\n"
+
+#: g10/tdbio.c:1472
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "trustdb: read failed (n=%d): %s\n"
+
+#: g10/tdbio.c:1497
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: not a trustdb file\n"
+
+#: g10/tdbio.c:1522
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: version record with recnum %lu\n"
+
+#: g10/tdbio.c:1528
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: invalid file version %d\n"
+
+#: g10/tdbio.c:1748
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: error reading free record: %s\n"
+
+#: g10/tdbio.c:1757
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: error writing dir record: %s\n"
+
+#: g10/tdbio.c:1768
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: failed to zero a record: %s\n"
+
+#: g10/tdbio.c:1804
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: failed to append a record: %s\n"
+
+#: g10/tdbio.c:1865
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "Error: The trustdb is corrupted.\n"
+
+#: g10/textfilter.c:146
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "can't handle text lines longer than %d characters\n"
+
+#: g10/textfilter.c:241
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "input line longer than %d characters\n"
+
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
+#, c-format
+msgid "error beginning transaction on TOFU database: %s\n"
+msgstr "error beginning transaction on TOFU database: %s\n"
+
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
+#, c-format
+msgid "error committing transaction on TOFU database: %s\n"
+msgstr "error committing transaction on TOFU database: %s\n"
+
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
+#, 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:512
++#: g10/tofu.c:435
+#, c-format
+msgid "unsupported TOFU database version: %s\n"
+msgstr "unsupported TOFU database version: %s\n"
+
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
+#, c-format
+msgid "error reading TOFU database: %s\n"
+msgstr "error reading TOFU database: %s\n"
+
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
+#, c-format
+msgid "error determining TOFU database's version: %s\n"
+msgstr "error determining TOFU database's version: %s\n"
+
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
+#, c-format
+msgid "error initializing TOFU database: %s\n"
+msgstr "error initializing TOFU database: %s\n"
+
- #: g10/tofu.c:761
++#: g10/tofu.c:658
+#, c-format
+msgid "error opening TOFU database '%s': %s\n"
+msgstr "error opening TOFU database '%s': %s\n"
+
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr "Warning: Home directory contains both tofu.db and tofu.d.\n"
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr "Using split format for TOFU database\n"
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
+#, c-format
+msgid "error updating TOFU database: %s\n"
+msgstr "error updating TOFU database: %s\n"
+
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
+#, c-format
+msgid "The binding %s is NOT known."
+msgstr "The binding %s is NOT known."
+
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
+#, c-format
+msgid ""
+"The key with fingerprint %s raised a conflict with the binding %s. Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
+msgstr ""
+"The key with fingerprint %s raised a conflict with the binding %s. Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
+
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
+#, c-format
+msgid ""
+"Please indicate whether you believe the binding %s%sis legitimate (the key "
+"belongs to the stated owner) or a forgery (bad)."
+msgstr ""
+"Please indicate whether you believe the binding %s%sis legitimate (the key "
+"belongs to the stated owner) or a forgery (bad)."
+
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
+#, c-format
+msgid "error gathering other user IDs: %s\n"
+msgstr "error gathering other user IDs: %s\n"
+
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
+msgid "Known user IDs associated with this key:\n"
+msgstr "Known user IDs associated with this key:\n"
+
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
+#, c-format
+msgid "policy: %s"
+msgstr "policy: %s"
+
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
+#, c-format
+msgid "error gathering signature stats: %s\n"
+msgstr "error gathering signature stats: %s\n"
+
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
+#, 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:1845
++#: g10/tofu.c:1318
+#, 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:1859
++#: g10/tofu.c:1332
+msgid "this key"
+msgstr "this key"
+
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
+#, c-format
+msgid "%ld message signed in the future."
+msgid_plural "%ld messages signed in the future."
+msgstr[0] "%ld message signed in the future."
+msgstr[1] "%ld messages signed in the future."
+
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
+#, c-format
+msgid "%ld message signed"
+msgid_plural "%ld messages signed"
+msgstr[0] "%ld message signed"
+msgstr[1] "%ld messages signed"
+
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
+#, c-format
+msgid " over the past %ld day."
+msgid_plural " over the past %ld days."
+msgstr[0] " over the past %ld day."
+msgstr[1] " over the past %ld days."
+
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
+#, c-format
+msgid " over the past %ld week."
+msgid_plural " over the past %ld weeks."
+msgstr[0] " over the past %ld week."
+msgstr[1] " over the past %ld weeks."
+
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
+#, c-format
+msgid " over the past %ld month."
+msgid_plural " over the past %ld months."
+msgstr[0] " over the past %ld month."
+msgstr[1] " over the past %ld months."
+
+#. 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:1909
++#: g10/tofu.c:1382
+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:1947
++#: g10/tofu.c:1420
+msgid "gGaAuUrRbB"
+msgstr "gGaAuUrRbB"
+
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
+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:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
+#, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "error setting TOFU binding's trust level to %s\n"
+
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
+#, c-format
+msgid "error changing TOFU policy: %s\n"
+msgstr "error changing TOFU policy: %s\n"
+
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
+#, c-format
+msgid "%d~year"
+msgid_plural "%d~years"
+msgstr[0] "%d~year"
+msgstr[1] "%d~years"
+
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
+#, c-format
+msgid "%d~month"
+msgid_plural "%d~months"
+msgstr[0] "%d~month"
+msgstr[1] "%d~months"
+
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
+#, c-format
+msgid "%d~day"
+msgid_plural "%d~days"
+msgstr[0] "%d~day"
+msgstr[1] "%d~days"
+
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
+#, c-format
+msgid "%d~hour"
+msgid_plural "%d~hours"
+msgstr[0] "%d~hour"
+msgstr[1] "%d~hours"
+
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
+#, c-format
+msgid "%d~minute"
+msgid_plural "%d~minutes"
+msgstr[0] "%d~minute"
+msgstr[1] "%d~minutes"
+
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
+#, c-format
+msgid "%d~second"
+msgid_plural "%d~seconds"
+msgstr[0] "%d~second"
+msgstr[1] "%d~seconds"
+
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
+#, c-format
+msgid "Have never verified a message signed by key %s!\n"
+msgstr "Have never verified a message signed by key %s!\n"
+
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
+#, c-format
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
+msgstr ""
+"Failed to collect signature statistics for “%s”\n"
+"(key %s)\n"
+
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
+#, c-format
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "Verified %ld messages signed by “%s”."
+
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
+#, c-format
+msgid ""
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
+msgid_plural ""
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
+msgstr[0] ""
+"Verified %ld message signed by “%s”\n"
+"in the past %s."
+msgstr[1] ""
+"Verified %ld messages signed by “%s”\n"
+"in the past %s."
+
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
+#, c-format
+msgid "The most recent message was verified %s ago."
+msgstr "The most recent message was verified %s ago."
+
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
+msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgstr "Warning: we've have yet to see a message signed by this key!\n"
+
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
+msgid "Warning: we've only seen a single message signed by this key!\n"
+msgstr "Warning: we've only seen a single message signed by this key!\n"
+
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
+#, c-format
+msgid ""
+"Warning: if you think you've seen more than %ld message signed by this key, "
+"then this key might be a forgery! Carefully examine the email address for "
+"small variations. If the key is suspect, then use\n"
+" %s\n"
+"to mark it as being bad.\n"
+msgid_plural ""
+"Warning: if you think you've seen more than %ld messages signed by this key, "
+"then this key might be a forgery! Carefully examine the email address for "
+"small variations. If the key is suspect, then use\n"
+" %s\n"
+"to mark it as being bad.\n"
+msgstr[0] ""
+"Warning: if you think you've seen more than %ld message signed by this key, "
+"then this key might be a forgery! Carefully examine the email address for "
+"small variations. If the key is suspect, then use\n"
+" %s\n"
+"to mark it as being bad.\n"
+msgstr[1] ""
+"Warning: if you think you've seen more than %ld messages signed by this key, "
+"then this key might be a forgery! Carefully examine the email address for "
+"small variations. If the key is suspect, then use\n"
+" %s\n"
+"to mark it as being bad.\n"
+
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
+#, c-format
+msgid "error opening TOFU database: %s\n"
+msgstr "error opening TOFU database: %s\n"
+
+#: g10/trustdb.c:215
+#, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "‘%s’ is not a valid long keyID\n"
+
+#: g10/trustdb.c:241
+#, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "key %s: accepted as trusted key\n"
+
+#: g10/trustdb.c:279
+#, 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:294
+#, 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:304
+#, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "key %s marked as ultimately trusted\n"
+
+#: g10/trustdb.c:340
+#, 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:346
+#, 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:421
+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:430
+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:467
+#, 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:473
+#, c-format
+msgid "using %s trust model\n"
+msgstr "using %s trust model\n"
+
+#: g10/trustdb.c:510
+msgid "no need for a trustdb check\n"
+msgstr "no need for a trustdb check\n"
+
+#: g10/trustdb.c:516 g10/trustdb.c:2130
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "next trustdb check due at %s\n"
+
+#: g10/trustdb.c:525
+#, 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:541
+#, 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:748 g10/trustdb.c:1283
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "public key %s not found: %s\n"
+
+#: g10/trustdb.c:965
+msgid "please do a --check-trustdb\n"
+msgstr "please do a --check-trustdb\n"
+
+#: g10/trustdb.c:970
+msgid "checking the trustdb\n"
+msgstr "checking the trustdb\n"
+
+#: g10/trustdb.c:1853
+#, c-format
+msgid "%d key processed"
+msgid_plural "%d keys processed"
+msgstr[0] "%d key processed"
+msgstr[1] "%d keys processed"
+
+#: g10/trustdb.c:1856
+#, 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:1926
+msgid "no ultimately trusted keys found\n"
+msgstr "no ultimately trusted keys found\n"
+
+#: g10/trustdb.c:1940
+#, 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:2057
+#, 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:2137
+#, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "unable to update trustdb version record: write failed: %s\n"
+
+#: g10/trust.c:105
+msgid "undefined"
+msgstr "undefined"
+
+#: g10/trust.c:106
+msgid "never"
+msgstr "never"
+
+#: g10/trust.c:107
+msgid "marginal"
+msgstr "marginal"
+
+#: g10/trust.c:108
+msgid "full"
+msgstr "full"
+
+#: g10/trust.c:109
+msgid "ultimate"
+msgstr "ultimate"
+
+#. TRANSLATORS: these strings are similar to those in
+#. trust_value_to_string(), but are a fixed length. This is needed to
+#. make attractive information listings where columns line up
+#. properly. The value "10" should be the length of the strings you
+#. choose to translate to. This is the length in printable columns.
+#. It gets passed to atoi() so everything after the number is
+#. essentially a comment and need not be translated. Either key and
+#. uid are both NULL, or neither are NULL.
+#: g10/trust.c:146
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr "10 translator see trust.c:uid_trust_string_fixed"
+
+#: g10/trust.c:149
+msgid "[ revoked]"
+msgstr "[ revoked]"
+
+#: g10/trust.c:151 g10/trust.c:157
+msgid "[ expired]"
+msgstr "[ expired]"
+
+#: g10/trust.c:156
+msgid "[ unknown]"
+msgstr "[ unknown]"
+
+#: g10/trust.c:158
+msgid "[ undef ]"
+msgstr "[ undef ]"
+
+#: g10/trust.c:159
+msgid "[ never ]"
+msgstr "[ never ]"
+
+#: g10/trust.c:160
+msgid "[marginal]"
+msgstr "[marginal]"
+
+#: g10/trust.c:161
+msgid "[ full ]"
+msgstr "[ full ]"
+
+#: g10/trust.c:162
+msgid "[ultimate]"
+msgstr "[ultimate]"
+
+#: g10/verify.c:117
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+
+#: g10/verify.c:204
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "input line %u too long or missing LF\n"
+
+#: g10/verify.c:253
+#, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "can't open fd %d: %s\n"
+
+#: kbx/kbxutil.c:92
+msgid "set debugging flags"
+msgstr "set debugging flags"
+
+#: kbx/kbxutil.c:93
+msgid "enable full debugging"
+msgstr "enable full debugging"
+
+#: kbx/kbxutil.c:117
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Usage: kbxutil [options] [files] (-h for help)"
+
+#: kbx/kbxutil.c:120
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"List, export, import Keybox data\n"
+msgstr ""
+"Syntax: kbxutil [options] [files]\n"
+"List, export, import Keybox data\n"
+
+#: scd/app-nks.c:714 scd/app-openpgp.c:2995
+#, 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:722 scd/app-openpgp.c:3007
+#, 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:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
+#: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
+#: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 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:835
+msgid "the NullPIN has not yet been changed\n"
+msgstr "the NullPIN has not yet been changed\n"
+
+#: scd/app-nks.c:1096
+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:1097
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Please enter the PIN for the standard keys."
+
+#: scd/app-nks.c:1103
+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:1105
+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:1113
+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:1115
+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:1123
+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:1125
+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:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "error getting new PIN: %s\n"
+
+#: scd/app-openpgp.c:805
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "failed to store the fingerprint: %s\n"
+
+#: scd/app-openpgp.c:818
+#, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "failed to store the creation date: %s\n"
+
+#: scd/app-openpgp.c:1286
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "reading public key failed: %s\n"
+
+#: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
+msgid "response does not contain the public key data\n"
+msgstr "response does not contain the public key data\n"
+
+#: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
+msgid "response does not contain the RSA modulus\n"
+msgstr "response does not contain the RSA modulus\n"
+
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
+msgid "response does not contain the RSA public exponent\n"
+msgstr "response does not contain the RSA public exponent\n"
+
+#: scd/app-openpgp.c:1322
+msgid "response does not contain the EC public point\n"
+msgstr "response does not contain the EC public point\n"
+
+#: scd/app-openpgp.c:1708
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr "using default PIN as %s\n"
+
+#: scd/app-openpgp.c:1715
+#, 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:1730
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Please enter the PIN%%0A[sigs done: %lu]"
+
+#: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
+msgid "||Please enter the PIN"
+msgstr "||Please enter the PIN"
+
+#: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
+#, 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:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
+#: scd/app-openpgp.c:3937
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "verify CHV%d failed: %s\n"
+
+#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
+msgid "error retrieving CHV status from card\n"
+msgstr "error retrieving CHV status from card\n"
+
+#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
+msgid "card is permanently locked!\n"
+msgstr "card is permanently locked!\n"
+
+#: scd/app-openpgp.c:1877
+#, c-format
+msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
+msgid_plural ""
+"%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr[0] "%d Admin PIN attempt remaining before card is permanently locked\n"
+msgstr[1] "%d Admin PIN attempts remaining before card is permanently locked\n"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string. Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1887
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+
+#: scd/app-openpgp.c:1891
+msgid "|A|Please enter the Admin PIN"
+msgstr "|A|Please enter the Admin PIN"
+
+#: scd/app-openpgp.c:1912
+msgid "access to admin commands is not configured\n"
+msgstr "access to admin commands is not configured\n"
+
+#: scd/app-openpgp.c:2265
+msgid "||Please enter the Reset Code for the card"
+msgstr "||Please enter the Reset Code for the card"
+
+#: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
+#, 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:2298
+msgid "|RN|New Reset Code"
+msgstr "|RN|New Reset Code"
+
+#: scd/app-openpgp.c:2299
+msgid "|AN|New Admin PIN"
+msgstr "|AN|New Admin PIN"
+
+#: scd/app-openpgp.c:2299
+msgid "|N|New PIN"
+msgstr "|N|New PIN"
+
+#: scd/app-openpgp.c:2370
+msgid "||Please enter the Admin PIN and New Admin PIN"
+msgstr "||Please enter the Admin PIN and New Admin PIN"
+
+#: scd/app-openpgp.c:2371
+msgid "||Please enter the PIN and New PIN"
+msgstr "||Please enter the PIN and New PIN"
+
+#: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
+msgid "error reading application data\n"
+msgstr "error reading application data\n"
+
+#: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
+msgid "error reading fingerprint DO\n"
+msgstr "error reading fingerprint DO\n"
+
+#: scd/app-openpgp.c:2443
+msgid "key already exists\n"
+msgstr "key already exists\n"
+
+#: scd/app-openpgp.c:2447
+msgid "existing key will be replaced\n"
+msgstr "existing key will be replaced\n"
+
+#: scd/app-openpgp.c:2449
+msgid "generating new key\n"
+msgstr "generating new key\n"
+
+#: scd/app-openpgp.c:2451
+msgid "writing new key\n"
+msgstr "writing new key\n"
+
+#: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
+msgid "creation timestamp missing\n"
+msgstr "creation timestamp missing\n"
+
+#: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
+#, 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:3158 scd/app-openpgp.c:3418
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "failed to store the key: %s\n"
+
+#: scd/app-openpgp.c:3320
+msgid "unsupported curve\n"
+msgstr "unsupported curve\n"
+
+#: scd/app-openpgp.c:3577
+msgid "please wait while key is being generated ...\n"
+msgstr "please wait while key is being generated ...\n"
+
+#: scd/app-openpgp.c:3590
+msgid "generating key failed\n"
+msgstr "generating key failed\n"
+
+#: scd/app-openpgp.c:3596
+#, 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:3661
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
+
+#: scd/app-openpgp.c:3711
+msgid "fingerprint on card does not match requested one\n"
+msgstr "fingerprint on card does not match requested one\n"
+
+#: scd/app-openpgp.c:3827
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "card does not support digest algorithm %s\n"
+
+#: scd/app-openpgp.c:3912
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signatures created so far: %lu\n"
+
+#: scd/app-openpgp.c:4365
+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:4659 scd/app-openpgp.c:4670
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "can't access %s - invalid OpenPGP card?\n"
+
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's pinpad"
+msgstr "||Please enter your PIN at the reader's pinpad"
+
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string. We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-dinsig.c:529
+msgid "|N|Initial New PIN"
+msgstr "|N|Initial New PIN"
+
+#: scd/scdaemon.c:114
+msgid "run in multi server mode (foreground)"
+msgstr "run in multi server mode (foreground)"
+
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr "|LEVEL|set the debugging level to LEVEL"
+
+#: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
+msgid "|FILE|write a log to FILE"
+msgstr "|FILE|write a log to FILE"
+
+#: scd/scdaemon.c:134
+msgid "|N|connect to reader at port N"
+msgstr "|N|connect to reader at port N"
+
+#: scd/scdaemon.c:136
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NAME|use NAME as ct-API driver"
+
+#: scd/scdaemon.c:138
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NAME|use NAME as PC/SC driver"
+
+#: scd/scdaemon.c:141
+msgid "do not use the internal CCID driver"
+msgstr "do not use the internal CCID driver"
+
+#: scd/scdaemon.c:147
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr "|N|disconnect the card after N seconds of inactivity"
+
+#: scd/scdaemon.c:150
+msgid "do not use a reader's pinpad"
+msgstr "do not use a reader's pinpad"
+
+#: scd/scdaemon.c:155
+msgid "deny the use of admin card commands"
+msgstr "deny the use of admin card commands"
+
+#: scd/scdaemon.c:158
+msgid "use variable length input for pinpad"
+msgstr "use variable length input for pinpad"
+
+#: scd/scdaemon.c:287
+msgid "Usage: @SCDAEMON@ [options] (-h for help)"
+msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
+
+#: scd/scdaemon.c:289
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for @GNUPG@\n"
+msgstr ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for @GNUPG@\n"
+
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
+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:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr "handler for fd %d started\n"
+
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
+#, c-format
+msgid "handler for fd %d terminated\n"
+msgstr "handler for fd %d terminated\n"
+
+#: sm/base64.c:327
+#, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "invalid radix64 character %02x skipped\n"
+
+#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
+msgid "no dirmngr running in this session\n"
+msgstr "no dirmngr running in this session\n"
+
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr "validation model requested by certificate: %s"
+
+#: sm/certchain.c:195 sm/certchain.c:1919
+msgid "chain"
+msgstr "chain"
+
+#: sm/certchain.c:196 sm/certchain.c:1919
+msgid "shell"
+msgstr "shell"
+
+#: sm/certchain.c:256 dirmngr/validate.c:107
+#, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "critical certificate extension %s is not supported"
+
+#: sm/certchain.c:295 dirmngr/validate.c:205
+msgid "issuer certificate is not marked as a CA"
+msgstr "issuer certificate is not marked as a CA"
+
+#: sm/certchain.c:333
+msgid "critical marked policy without configured policies"
+msgstr "critical marked policy without configured policies"
+
+#: sm/certchain.c:343
+#, c-format
+msgid "failed to open '%s': %s\n"
+msgstr "failed to open '%s': %s\n"
+
+#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
+msgid "Note: non-critical certificate policy not allowed"
+msgstr "Note: non-critical certificate policy not allowed"
+
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
+msgid "certificate policy not allowed"
+msgstr "certificate policy not allowed"
+
+#: sm/certchain.c:527
+msgid "looking up issuer at external location\n"
+msgstr "looking up issuer at external location\n"
+
+#: sm/certchain.c:546
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr "number of issuers matching: %d\n"
+
+#: sm/certchain.c:590
+msgid "looking up issuer from the Dirmngr cache\n"
+msgstr "looking up issuer from the Dirmngr cache\n"
+
+#: sm/certchain.c:614
+#, c-format
+msgid "number of matching certificates: %d\n"
+msgstr "number of matching certificates: %d\n"
+
+#: sm/certchain.c:616
+#, c-format
+msgid "dirmngr cache-only key lookup failed: %s\n"
+msgstr "dirmngr cache-only key lookup failed: %s\n"
+
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
+#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
+msgid "failed to allocate keyDB handle\n"
+msgstr "failed to allocate keyDB handle\n"
+
+#: sm/certchain.c:981
+msgid "certificate has been revoked"
+msgstr "certificate has been revoked"
+
+#: sm/certchain.c:996
+msgid "the status of the certificate is unknown"
+msgstr "the status of the certificate is unknown"
+
+#: sm/certchain.c:1003
+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:1009
+#, c-format
+msgid "checking the CRL failed: %s"
+msgstr "checking the CRL failed: %s"
+
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr "certificate with invalid validity: %s"
+
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
+msgid "certificate not yet valid"
+msgstr "certificate not yet valid"
+
+#: sm/certchain.c:1054 sm/certchain.c:1139
+msgid "root certificate not yet valid"
+msgstr "root certificate not yet valid"
+
+#: sm/certchain.c:1055 sm/certchain.c:1140
+msgid "intermediate certificate not yet valid"
+msgstr "intermediate certificate not yet valid"
+
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
+msgid "certificate has expired"
+msgstr "certificate has expired"
+
+#: sm/certchain.c:1069
+msgid "root certificate has expired"
+msgstr "root certificate has expired"
+
+#: sm/certchain.c:1070
+msgid "intermediate certificate has expired"
+msgstr "intermediate certificate has expired"
+
+#: sm/certchain.c:1112
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
+msgstr "required certificate attributes missing: %s%s%s"
+
+#: sm/certchain.c:1121
+msgid "certificate with invalid validity"
+msgstr "certificate with invalid validity"
+
+#: sm/certchain.c:1158
+msgid "signature not created during lifetime of certificate"
+msgstr "signature not created during lifetime of certificate"
+
+#: sm/certchain.c:1160
+msgid "certificate not created during lifetime of issuer"
+msgstr "certificate not created during lifetime of issuer"
+
+#: sm/certchain.c:1161
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr "intermediate certificate not created during lifetime of issuer"
+
+#: sm/certchain.c:1165
+msgid " ( signature created at "
+msgstr " ( signature created at "
+
+#: sm/certchain.c:1166
+msgid " (certificate created at "
+msgstr " (certificate created at "
+
+#: sm/certchain.c:1169
+msgid " (certificate valid from "
+msgstr " (certificate valid from "
+
+#: sm/certchain.c:1170
+msgid " ( issuer valid from "
+msgstr " ( issuer valid from "
+
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
+#, c-format
+msgid "fingerprint=%s\n"
+msgstr "fingerprint=%s\n"
+
+#: sm/certchain.c:1209
+msgid "root certificate has now been marked as trusted\n"
+msgstr "root certificate has now been marked as trusted\n"
+
+#: sm/certchain.c:1222
+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:1228
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr "interactive marking as trusted disabled for this session\n"
+
+#: sm/certchain.c:1286
+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:1350
+msgid "no issuer found in certificate"
+msgstr "no issuer found in certificate"
+
+#: sm/certchain.c:1428
+msgid "self-signed certificate has a BAD signature"
+msgstr "self-signed certificate has a BAD signature"
+
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
+msgid "root certificate is not marked trusted"
+msgstr "root certificate is not marked trusted"
+
+#: sm/certchain.c:1513
+#, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "checking the trust list failed: %s\n"
+
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
+msgid "certificate chain too long\n"
+msgstr "certificate chain too long\n"
+
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
+msgid "issuer certificate not found"
+msgstr "issuer certificate not found"
+
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
+msgid "certificate has a BAD signature"
+msgstr "certificate has a BAD signature"
+
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
+msgid "found another possible matching CA certificate - trying again"
+msgstr "found another possible matching CA certificate - trying again"
+
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr "certificate chain longer than allowed by CA (%d)"
+
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
+msgid "certificate is good\n"
+msgstr "certificate is good\n"
+
+#: sm/certchain.c:1723
+msgid "intermediate certificate is good\n"
+msgstr "intermediate certificate is good\n"
+
+#: sm/certchain.c:1724
+msgid "root certificate is good\n"
+msgstr "root certificate is good\n"
+
+#: sm/certchain.c:1906
+msgid "switching to chain model"
+msgstr "switching to chain model"
+
+#: sm/certchain.c:1915
+#, c-format
+msgid "validation model used: %s"
+msgstr "validation model used: %s"
+
+#: sm/certcheck.c:107
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr "a %u bit hash is not valid for a %u bit %s key\n"
+
+#: sm/certcheck.c:244 sm/verify.c:202
+msgid "(this is the MD2 algorithm)\n"
+msgstr "(this is the MD2 algorithm)\n"
+
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
+msgid "none"
+msgstr "none"
+
+#: sm/certdump.c:552 sm/certdump.c:617
+msgid "[Error - invalid encoding]"
+msgstr "[Error - invalid encoding]"
+
+#: sm/certdump.c:560
+msgid "[Error - out of core]"
+msgstr "[Error - out of core]"
+
+#: sm/certdump.c:596
+msgid "[Error - No name]"
+msgstr "[Error - No name]"
+
+#: sm/certdump.c:623
+msgid "[Error - invalid DN]"
+msgstr "[Error - invalid DN]"
+
+#: sm/certdump.c:833
+#, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for the X.509 "
+"certificate:\n"
+"\"%s\"\n"
+"S/N %s, ID 0x%08lX,\n"
+"created %s, expires %s.\n"
+msgstr ""
+"Please enter the passphrase to unlock the secret key for the X.509 "
+"certificate:\n"
+"“%s”\n"
+"S/N %s, ID 0x%08lX,\n"
+"created %s, expires %s.\n"
+
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
+msgid "no key usage specified - assuming all usages\n"
+msgstr "no key usage specified - assuming all usages\n"
+
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "error getting key usage information: %s\n"
+
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
+msgid "certificate should not have been used for certification\n"
+msgstr "certificate should not have been used for certification\n"
+
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
+msgid "certificate should not have been used for OCSP response signing\n"
+msgstr "certificate should not have been used for OCSP response signing\n"
+
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
+msgid "certificate should not have been used for encryption\n"
+msgstr "certificate should not have been used for encryption\n"
+
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
+msgid "certificate should not have been used for signing\n"
+msgstr "certificate should not have been used for signing\n"
+
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
+msgid "certificate is not usable for encryption\n"
+msgstr "certificate is not usable for encryption\n"
+
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
+msgid "certificate is not usable for signing\n"
+msgstr "certificate is not usable for signing\n"
+
+#: sm/certreqgen.c:464
+#, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "line %d: invalid algorithm\n"
+
+#: sm/certreqgen.c:478
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr "line %d: invalid key length %u (valid are %d to %d)\n"
+
+#: sm/certreqgen.c:496
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr "line %d: no subject name given\n"
+
+#: sm/certreqgen.c:505
+#, c-format
+msgid "line %d: invalid subject name label '%.*s'\n"
+msgstr "line %d: invalid subject name label ‘%.*s’\n"
+
+#: sm/certreqgen.c:508
+#, c-format
+msgid "line %d: invalid subject name '%s' at pos %d\n"
+msgstr "line %d: invalid subject name ‘%s’ at pos %d\n"
+
+#: sm/certreqgen.c:525
+#, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "line %d: not a valid email address\n"
+
+#: sm/certreqgen.c:544
+#, c-format
+msgid "line %d: invalid serial number\n"
+msgstr "line %d: invalid serial number\n"
+
+#: sm/certreqgen.c:560
+#, c-format
+msgid "line %d: invalid issuer name label '%.*s'\n"
+msgstr "line %d: invalid issuer name label ‘%.*s’\n"
+
+#: sm/certreqgen.c:563
+#, c-format
+msgid "line %d: invalid issuer name '%s' at pos %d\n"
+msgstr "line %d: invalid issuer name ‘%s’ at pos %d\n"
+
+#: sm/certreqgen.c:575 sm/certreqgen.c:586
+#, c-format
+msgid "line %d: invalid date given\n"
+msgstr "line %d: invalid date given\n"
+
+#: sm/certreqgen.c:599
+#, c-format
+msgid "line %d: error getting signing key by keygrip '%s': %s\n"
+msgstr "line %d: error getting signing key by keygrip '%s': %s\n"
+
+#: sm/certreqgen.c:618
+#, c-format
+msgid "line %d: invalid hash algorithm given\n"
+msgstr "line %d: invalid hash algorithm given\n"
+
+#: sm/certreqgen.c:633
+#, c-format
+msgid "line %d: invalid authority-key-id\n"
+msgstr "line %d: invalid authority-key-id\n"
+
+#: sm/certreqgen.c:648
+#, c-format
+msgid "line %d: invalid subject-key-id\n"
+msgstr "line %d: invalid subject-key-id\n"
+
+#: sm/certreqgen.c:686
+#, c-format
+msgid "line %d: invalid extension syntax\n"
+msgstr "line %d: invalid extension syntax\n"
+
+#: sm/certreqgen.c:699
+#, c-format
+msgid "line %d: error reading key '%s' from card: %s\n"
+msgstr "line %d: error reading key ‘%s’ from card: %s\n"
+
+#: sm/certreqgen.c:712
+#, c-format
+msgid "line %d: error getting key by keygrip '%s': %s\n"
+msgstr "line %d: error getting key by keygrip '%s': %s\n"
+
+#: sm/certreqgen.c:729
+#, c-format
+msgid "line %d: key generation failed: %s <%s>\n"
+msgstr "line %d: key generation failed: %s <%s>\n"
+
+#: sm/certreqgen.c:1324
+msgid ""
+"To complete this certificate request please enter the passphrase for the key "
+"you just created once more.\n"
+msgstr ""
+"To complete this certificate request please enter the passphrase for the key "
+"you just created once more.\n"
+
+#: sm/certreqgen-ui.c:162
+#, c-format
+msgid " (%d) RSA\n"
+msgstr " (%d) RSA\n"
+
+#: sm/certreqgen-ui.c:163
+#, c-format
+msgid " (%d) Existing key\n"
+msgstr " (%d) Existing key\n"
+
+#: sm/certreqgen-ui.c:164
+#, c-format
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) Existing key from card\n"
+
+#: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
+#, c-format
+msgid "error reading the card: %s\n"
+msgstr "error reading the card: %s\n"
+
+#: sm/certreqgen-ui.c:237
+#, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "Serial number of the card: %s\n"
+
+#: sm/certreqgen-ui.c:249
+msgid "Available keys:\n"
+msgstr "Available keys:\n"
+
+#: sm/certreqgen-ui.c:280
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr "Possible actions for a %s key:\n"
+
+#: sm/certreqgen-ui.c:281
+#, c-format
+msgid " (%d) sign, encrypt\n"
+msgstr " (%d) sign, encrypt\n"
+
+#: sm/certreqgen-ui.c:282
+#, c-format
+msgid " (%d) sign\n"
+msgstr " (%d) sign\n"
+
+#: sm/certreqgen-ui.c:283
+#, c-format
+msgid " (%d) encrypt\n"
+msgstr " (%d) encrypt\n"
+
+#: sm/certreqgen-ui.c:307
+msgid "Enter the X.509 subject name: "
+msgstr "Enter the X.509 subject name: "
+
+#: sm/certreqgen-ui.c:311
+msgid "No subject name given\n"
+msgstr "No subject name given\n"
+
+#: sm/certreqgen-ui.c:315
+#, c-format
+msgid "Invalid subject name label '%.*s'\n"
+msgstr "Invalid subject name label ‘%.*s’\n"
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s". Please
+#. adjust it do the length of your translation. The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:324
+#, c-format
+msgid "Invalid subject name '%s'\n"
+msgstr "Invalid subject name ‘%s’\n"
+
+#: sm/certreqgen-ui.c:326
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+
+#: sm/certreqgen-ui.c:338
+msgid "Enter email addresses"
+msgstr "Enter email addresses"
+
+#: sm/certreqgen-ui.c:339
+msgid " (end with an empty line):\n"
+msgstr " (end with an empty line):\n"
+
+#: sm/certreqgen-ui.c:343
+msgid "Enter DNS names"
+msgstr "Enter DNS names"
+
+#: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
+msgid " (optional; end with an empty line):\n"
+msgstr " (optional; end with an empty line):\n"
+
+#: sm/certreqgen-ui.c:348
+msgid "Enter URIs"
+msgstr "Enter URIs"
+
+#: sm/certreqgen-ui.c:355
+msgid "Create self-signed certificate? (y/N) "
+msgstr "Create self-signed certificate? (y/N) "
+
+#: sm/certreqgen-ui.c:382
+msgid "These parameters are used:\n"
+msgstr "These parameters are used:\n"
+
+#: sm/certreqgen-ui.c:400
+msgid "Now creating self-signed certificate. "
+msgstr "Now creating self-signed certificate. "
+
+#: sm/certreqgen-ui.c:402
+msgid "Now creating certificate request. "
+msgstr "Now creating certificate request. "
+
+#: sm/certreqgen-ui.c:403
+msgid "This may take a while ...\n"
+msgstr "This may take a while ...\n"
+
+#: sm/certreqgen-ui.c:414
+msgid "Ready.\n"
+msgstr "Ready.\n"
+
+#: sm/certreqgen-ui.c:417
+msgid "Ready. You should now send this request to your CA.\n"
+msgstr "Ready. You should now send this request to your CA.\n"
+
+#: sm/certreqgen-ui.c:423
+msgid "resource problem: out of core\n"
+msgstr "resource problem: out of core\n"
+
+#: sm/decrypt.c:330
+msgid "(this is the RC2 algorithm)\n"
+msgstr "(this is the RC2 algorithm)\n"
+
+#: sm/decrypt.c:332
+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:1223 sm/keydb.c:1321
+#, c-format
+msgid "error locking keybox: %s\n"
+msgstr "error locking keybox: %s\n"
+
+#: sm/delete.c:143
+#, c-format
+msgid "duplicated certificate '%s' deleted\n"
+msgstr "duplicated certificate ‘%s’ deleted\n"
+
+#: sm/delete.c:145
+#, c-format
+msgid "certificate '%s' deleted\n"
+msgstr "certificate ‘%s’ deleted\n"
+
+#: sm/delete.c:175
+#, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "deleting certificate “%s” failed: %s\n"
+
+#: sm/encrypt.c:328
+msgid "no valid recipients given\n"
+msgstr "no valid recipients given\n"
+
+#: sm/gpgsm.c:207
+msgid "list external keys"
+msgstr "list external keys"
+
+#: sm/gpgsm.c:209
+msgid "list certificate chain"
+msgstr "list certificate chain"
+
+#: sm/gpgsm.c:216
+msgid "import certificates"
+msgstr "import certificates"
+
+#: sm/gpgsm.c:217
+msgid "export certificates"
+msgstr "export certificates"
+
+#: sm/gpgsm.c:225
+msgid "register a smartcard"
+msgstr "register a smartcard"
+
+#: sm/gpgsm.c:228
+msgid "pass a command to the dirmngr"
+msgstr "pass a command to the dirmngr"
+
+#: sm/gpgsm.c:230
+msgid "invoke gpg-protect-tool"
+msgstr "invoke gpg-protect-tool"
+
+#: sm/gpgsm.c:246
+msgid "create base-64 encoded output"
+msgstr "create base-64 encoded output"
+
+#: sm/gpgsm.c:254
+msgid "assume input is in PEM format"
+msgstr "assume input is in PEM format"
+
+#: sm/gpgsm.c:256
+msgid "assume input is in base-64 format"
+msgstr "assume input is in base-64 format"
+
+#: sm/gpgsm.c:258
+msgid "assume input is in binary format"
+msgstr "assume input is in binary format"
+
+#: sm/gpgsm.c:265
+msgid "never consult a CRL"
+msgstr "never consult a CRL"
+
+#: sm/gpgsm.c:275
+msgid "check validity using OCSP"
+msgstr "check validity using OCSP"
+
+#: sm/gpgsm.c:280
+msgid "|N|number of certificates to include"
+msgstr "|N|number of certificates to include"
+
+#: sm/gpgsm.c:283
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|take policy information from FILE"
+
+#: sm/gpgsm.c:286
+msgid "do not check certificate policies"
+msgstr "do not check certificate policies"
+
+#: sm/gpgsm.c:290
+msgid "fetch missing issuer certificates"
+msgstr "fetch missing issuer certificates"
+
+#: sm/gpgsm.c:301
+msgid "don't use the terminal at all"
+msgstr "don't use the terminal at all"
+
+#: sm/gpgsm.c:303
+msgid "|FILE|write a server mode log to FILE"
+msgstr "|FILE|write a server mode log to FILE"
+
+#: sm/gpgsm.c:308
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|write an audit log to FILE"
+
+#: sm/gpgsm.c:311
+msgid "batch mode: never ask"
+msgstr "batch mode: never ask"
+
+#: sm/gpgsm.c:312
+msgid "assume yes on most questions"
+msgstr "assume yes on most questions"
+
+#: sm/gpgsm.c:313
+msgid "assume no on most questions"
+msgstr "assume no on most questions"
+
+#: sm/gpgsm.c:316
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|add keyring to the list of keyrings"
+
+#: sm/gpgsm.c:319
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|use USER-ID as default secret key"
+
+#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|use this keyserver to lookup keys"
+
+#: sm/gpgsm.c:346
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|use cipher algorithm NAME"
+
+#: sm/gpgsm.c:348
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|use message digest algorithm NAME"
+
+#: sm/gpgsm.c:564
+msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
+msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
+
+#: sm/gpgsm.c:567
+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:771
+#, 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:782
+#, c-format
+msgid "unknown validation model '%s'\n"
+msgstr "unknown validation model ‘%s’\n"
+
+#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "%s:%u: no hostname given\n"
+
+#: sm/gpgsm.c:852 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:873 dirmngr/ldapserver.c:126
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: skipping this line\n"
+
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
+msgid "could not parse keyserver\n"
+msgstr "could not parse keyserver\n"
+
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
+#, c-format
+msgid "importing common certificates '%s'\n"
+msgstr "importing common certificates ‘%s’\n"
+
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
+#, c-format
+msgid "can't sign using '%s': %s\n"
+msgstr "can't sign using '%s': %s\n"
+
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
+msgid "invalid command (there is no implicit command)\n"
+msgstr "invalid command (there is no implicit command)\n"
+
+#: sm/import.c:127
+#, c-format
+msgid "total number processed: %lu\n"
+msgstr "total number processed: %lu\n"
+
+#: sm/import.c:246
+msgid "error storing certificate\n"
+msgstr "error storing certificate\n"
+
+#: sm/import.c:254
+msgid "basic certificate checks failed - not imported\n"
+msgstr "basic certificate checks failed - not imported\n"
+
+#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
+#, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "error getting stored flags: %s\n"
+
+#: sm/import.c:526 sm/import.c:558
+#, c-format
+msgid "error importing certificate: %s\n"
+msgstr "error importing certificate: %s\n"
+
+#: sm/import.c:746 tools/gpg-connect-agent.c:1433
+#, c-format
+msgid "error reading input: %s\n"
+msgstr "error reading input: %s\n"
+
+#: sm/keydb.c:1120 sm/keydb.c:1206
+msgid "failed to get the fingerprint\n"
+msgstr "failed to get the fingerprint\n"
+
+#: sm/keydb.c:1162
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr "problem looking for existing certificate: %s\n"
+
+#: sm/keydb.c:1174
+#, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "error finding writable keyDB: %s\n"
+
+#: sm/keydb.c:1182
+#, c-format
+msgid "error storing certificate: %s\n"
+msgstr "error storing certificate: %s\n"
+
+#: sm/keydb.c:1234
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "problem re-searching certificate: %s\n"
+
+#: sm/keydb.c:1255 sm/keydb.c:1344
+#, c-format
+msgid "error storing flags: %s\n"
+msgstr "error storing flags: %s\n"
+
- #: sm/keylist.c:658
++#: sm/keylist.c:657
+msgid "Error - "
+msgstr "Error - "
+
+#: sm/misc.c:58
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr "GPG_TTY has not been set - using maybe bogus default\n"
+
+#: sm/qualified.c:105
+#, c-format
+msgid "invalid formatted fingerprint in '%s', line %d\n"
+msgstr "invalid formatted fingerprint in '%s', line %d\n"
+
+#: sm/qualified.c:123
+#, c-format
+msgid "invalid country code in '%s', line %d\n"
+msgstr "invalid country code in '%s', line %d\n"
+
+#: sm/qualified.c:206
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+"You are about to create a signature using your certificate:\n"
+"“%s”\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+
+#: sm/qualified.c:215 sm/verify.c:617
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+
+#: sm/qualified.c:282
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+"You are about to create a signature using your certificate:\n"
+"“%s”\n"
+"Note, that this certificate will NOT create a qualified signature!"
+
+#: sm/sign.c:451
+#, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+
+#: sm/sign.c:465
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr "hash algorithm used for signer %d: %s (%s)\n"
+
+#: sm/sign.c:517
+#, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "checking for qualified certificate failed: %s\n"
+
+#: sm/verify.c:450
+msgid "Signature made "
+msgstr "Signature made "
+
+#: sm/verify.c:454
+msgid "[date not given]"
+msgstr "[date not given]"
+
+#: sm/verify.c:455
+#, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr " using certificate ID 0x%08lX\n"
+
+#: sm/verify.c:474
+msgid ""
+"invalid signature: message digest attribute does not match computed one\n"
+msgstr ""
+"invalid signature: message digest attribute does not match computed one\n"
+
+#: sm/verify.c:595
+msgid "Good signature from"
+msgstr "Good signature from"
+
+#: sm/verify.c:596
+msgid " aka"
+msgstr " aka"
+
+#: sm/verify.c:614
+msgid "This is a qualified signature\n"
+msgstr "This is a qualified signature\n"
+
+#: dirmngr/certcache.c:106
+#, c-format
+msgid "can't initialize certificate cache lock: %s\n"
+msgstr "can't initialize certificate cache lock: %s\n"
+
+#: dirmngr/certcache.c:117
+#, c-format
+msgid "can't acquire read lock on the certificate cache: %s\n"
+msgstr "can't acquire read lock on the certificate cache: %s\n"
+
+#: dirmngr/certcache.c:128
+#, c-format
+msgid "can't acquire write lock on the certificate cache: %s\n"
+msgstr "can't acquire write lock on the certificate cache: %s\n"
+
+#: dirmngr/certcache.c:139
+#, c-format
+msgid "can't release lock on the certificate cache: %s\n"
+msgstr "can't release lock on the certificate cache: %s\n"
+
+#: dirmngr/certcache.c:267
+#, c-format
+msgid "dropping %u certificates from the cache\n"
+msgstr "dropping %u certificates from the cache\n"
+
- #: dirmngr/certcache.c:352
- #, c-format
- msgid "can't access directory '%s': %s\n"
- msgstr "can't access directory '%s': %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
+#, c-format
+msgid "can't parse certificate '%s': %s\n"
+msgstr "can't parse certificate '%s': %s\n"
+
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
+#, c-format
+msgid "certificate '%s' already cached\n"
+msgstr "certificate ‘%s’ already cached\n"
+
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
+#, c-format
+msgid "trusted certificate '%s' loaded\n"
+msgstr "trusted certificate ‘%s’ loaded\n"
+
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
+#, c-format
+msgid "certificate '%s' loaded\n"
+msgstr "certificate ‘%s’ loaded\n"
+
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
+#, c-format
+msgid " SHA1 fingerprint = %s\n"
+msgstr " SHA1 fingerprint = %s\n"
+
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
+msgid " issuer ="
+msgstr " issuer ="
+
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
+msgid " subject ="
+msgstr " subject ="
+
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
+#, c-format
+msgid "error loading certificate '%s': %s\n"
+msgstr "error loading certificate '%s': %s\n"
+
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
+#, c-format
+msgid "permanently loaded certificates: %u\n"
+msgstr "permanently loaded certificates: %u\n"
+
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
+#, c-format
+msgid " runtime cached certificates: %u\n"
+msgstr " runtime cached certificates: %u\n"
+
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
+msgid "certificate already cached\n"
+msgstr "certificate already cached\n"
+
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
+msgid "certificate cached\n"
+msgstr "certificate cached\n"
+
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
+#, c-format
+msgid "error caching certificate: %s\n"
+msgstr "error caching certificate: %s\n"
+
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
+#, c-format
+msgid "invalid SHA1 fingerprint string '%s'\n"
+msgstr "invalid SHA1 fingerprint string ‘%s’\n"
+
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
+#, c-format
+msgid "error fetching certificate by S/N: %s\n"
+msgstr "error fetching certificate by S/N: %s\n"
+
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
+#, c-format
+msgid "error fetching certificate by subject: %s\n"
+msgstr "error fetching certificate by subject: %s\n"
+
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
+msgid "no issuer found in certificate\n"
+msgstr "no issuer found in certificate\n"
+
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
+#, c-format
+msgid "error getting authorityKeyIdentifier: %s\n"
+msgstr "error getting authorityKeyIdentifier: %s\n"
+
+#: dirmngr/crlcache.c:213
+#, c-format
+msgid "creating directory '%s'\n"
+msgstr "creating directory ‘%s’\n"
+
+#: dirmngr/crlcache.c:217
+#, c-format
+msgid "error creating directory '%s': %s\n"
+msgstr "error creating directory '%s': %s\n"
+
+#: dirmngr/crlcache.c:245
+#, c-format
+msgid "ignoring database dir '%s'\n"
+msgstr "ignoring database dir ‘%s’\n"
+
+#: dirmngr/crlcache.c:254
+#, c-format
+msgid "error reading directory '%s': %s\n"
+msgstr "error reading directory '%s': %s\n"
+
+#: dirmngr/crlcache.c:275
+#, c-format
+msgid "removing cache file '%s'\n"
+msgstr "removing cache file ‘%s’\n"
+
+#: dirmngr/crlcache.c:284
+#, c-format
+msgid "not removing file '%s'\n"
+msgstr "not removing file ‘%s’\n"
+
+#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
+#, c-format
+msgid "error closing cache file: %s\n"
+msgstr "error closing cache file: %s\n"
+
+#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
+#, c-format
+msgid "failed to open cache dir file '%s': %s\n"
+msgstr "failed to open cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:421
+#, c-format
+msgid "error creating new cache dir file '%s': %s\n"
+msgstr "error creating new cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:428
+#, c-format
+msgid "error writing new cache dir file '%s': %s\n"
+msgstr "error writing new cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:435
+#, c-format
+msgid "error closing new cache dir file '%s': %s\n"
+msgstr "error closing new cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:440
+#, c-format
+msgid "new cache dir file '%s' created\n"
+msgstr "new cache dir file ‘%s’ created\n"
+
+#: dirmngr/crlcache.c:445
+#, c-format
+msgid "failed to re-open cache dir file '%s': %s\n"
+msgstr "failed to re-open cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:473
+#, c-format
+msgid "first record of '%s' is not the version\n"
+msgstr "first record of ‘%s’ is not the version\n"
+
+#: dirmngr/crlcache.c:488
+msgid "old version of cache directory - cleaning up\n"
+msgstr "old version of cache directory - cleaning up\n"
+
+#: dirmngr/crlcache.c:504
+msgid "old version of cache directory - giving up\n"
+msgstr "old version of cache directory - giving up\n"
+
+#: dirmngr/crlcache.c:615
+#, c-format
+msgid "extra field detected in crl record of '%s' line %u\n"
+msgstr "extra field detected in crl record of ‘%s’ line %u\n"
+
+#: dirmngr/crlcache.c:623
+#, c-format
+msgid "invalid line detected in '%s' line %u\n"
+msgstr "invalid line detected in ‘%s’ line %u\n"
+
+#: dirmngr/crlcache.c:632
+#, c-format
+msgid "duplicate entry detected in '%s' line %u\n"
+msgstr "duplicate entry detected in ‘%s’ line %u\n"
+
+#: dirmngr/crlcache.c:647
+#, c-format
+msgid "unsupported record type in '%s' line %u skipped\n"
+msgstr "unsupported record type in ‘%s’ line %u skipped\n"
+
+#: dirmngr/crlcache.c:673
+#, c-format
+msgid "invalid issuer hash in '%s' line %u\n"
+msgstr "invalid issuer hash in ‘%s’ line %u\n"
+
+#: dirmngr/crlcache.c:679
+#, c-format
+msgid "no issuer DN in '%s' line %u\n"
+msgstr "no issuer DN in ‘%s’ line %u\n"
+
+#: dirmngr/crlcache.c:686
+#, c-format
+msgid "invalid timestamp in '%s' line %u\n"
+msgstr "invalid timestamp in ‘%s’ line %u\n"
+
+#: dirmngr/crlcache.c:692
+#, c-format
+msgid "WARNING: invalid cache file hash in '%s' line %u\n"
+msgstr "WARNING: invalid cache file hash in ‘%s’ line %u\n"
+
+#: dirmngr/crlcache.c:698
+msgid "detected errors in cache dir file\n"
+msgstr "detected errors in cache dir file\n"
+
+#: dirmngr/crlcache.c:699
+msgid "please check the reason and manually delete that file\n"
+msgstr "please check the reason and manually delete that file\n"
+
+#: dirmngr/crlcache.c:827 dirmngr/crlcache.c:841
+#, c-format
+msgid "failed to create temporary cache dir file '%s': %s\n"
+msgstr "failed to create temporary cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:937
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr "error closing '%s': %s\n"
+
+#: dirmngr/crlcache.c:949
+#, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "error renaming ‘%s’ to '%s': %s\n"
+
+#: dirmngr/crlcache.c:1003
+#, c-format
+msgid "can't hash '%s': %s\n"
+msgstr "can't hash '%s': %s\n"
+
+#: dirmngr/crlcache.c:1011
+#, c-format
+msgid "error setting up MD5 hash context: %s\n"
+msgstr "error setting up MD5 hash context: %s\n"
+
+#: dirmngr/crlcache.c:1027
+#, c-format
+msgid "error hashing '%s': %s\n"
+msgstr "error hashing '%s': %s\n"
+
+#: dirmngr/crlcache.c:1055
+#, c-format
+msgid "invalid formatted checksum for '%s'\n"
+msgstr "invalid formatted checksum for ‘%s’\n"
+
+#: dirmngr/crlcache.c:1108
+msgid "too many open cache files; can't open anymore\n"
+msgstr "too many open cache files; can't open anymore\n"
+
+#: dirmngr/crlcache.c:1126
+#, c-format
+msgid "opening cache file '%s'\n"
+msgstr "opening cache file ‘%s’\n"
+
+#: dirmngr/crlcache.c:1145
+#, c-format
+msgid "error opening cache file '%s': %s\n"
+msgstr "error opening cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:1154
+#, c-format
+msgid "error initializing cache file '%s' for reading: %s\n"
+msgstr "error initializing cache file ‘%s’ for reading: %s\n"
+
+#: dirmngr/crlcache.c:1175
+msgid "calling unlock_db_file on a closed file\n"
+msgstr "calling unlock_db_file on a closed file\n"
+
+#: dirmngr/crlcache.c:1177
+msgid "calling unlock_db_file on an unlocked file\n"
+msgstr "calling unlock_db_file on an unlocked file\n"
+
+#: dirmngr/crlcache.c:1231
+#, c-format
+msgid "failed to create a new cache object: %s\n"
+msgstr "failed to create a new cache object: %s\n"
+
+#: dirmngr/crlcache.c:1286
+#, c-format
+msgid "no CRL available for issuer id %s\n"
+msgstr "no CRL available for issuer id %s\n"
+
+#: dirmngr/crlcache.c:1293
+#, c-format
+msgid "cached CRL for issuer id %s too old; update required\n"
+msgstr "cached CRL for issuer id %s too old; update required\n"
+
+#: dirmngr/crlcache.c:1307
+#, c-format
+msgid ""
+"force-crl-refresh active and %d minutes passed for issuer id %s; update "
+"required\n"
+msgstr ""
+"force-crl-refresh active and %d minutes passed for issuer id %s; update "
+"required\n"
+
+#: dirmngr/crlcache.c:1315
+#, c-format
+msgid "force-crl-refresh active for issuer id %s; update required\n"
+msgstr "force-crl-refresh active for issuer id %s; update required\n"
+
+#: dirmngr/crlcache.c:1324
+#, c-format
+msgid "available CRL for issuer ID %s can't be used\n"
+msgstr "available CRL for issuer ID %s can't be used\n"
+
+#: dirmngr/crlcache.c:1335
+#, c-format
+msgid "cached CRL for issuer id %s tampered; we need to update\n"
+msgstr "cached CRL for issuer id %s tampered; we need to update\n"
+
+#: dirmngr/crlcache.c:1347
+msgid "WARNING: invalid cache record length for S/N "
+msgstr "WARNING: invalid cache record length for S/N "
+
+#: dirmngr/crlcache.c:1357
+#, c-format
+msgid "problem reading cache record for S/N %s: %s\n"
+msgstr "problem reading cache record for S/N %s: %s\n"
+
+#: dirmngr/crlcache.c:1360
+#, c-format
+msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
+msgstr "S/N %s is not valid; reason=%02X date=%.15s\n"
+
+#: dirmngr/crlcache.c:1371
+#, c-format
+msgid "S/N %s is valid, it is not listed in the CRL\n"
+msgstr "S/N %s is valid, it is not listed in the CRL\n"
+
+#: dirmngr/crlcache.c:1379
+#, c-format
+msgid "error getting data from cache file: %s\n"
+msgstr "error getting data from cache file: %s\n"
+
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "unknown hash algorithm ‘%s’\n"
+
+#: dirmngr/crlcache.c:1549
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr "gcry_md_open for algorithm %d failed: %s\n"
+
+#: dirmngr/crlcache.c:1586 dirmngr/crlcache.c:1605
+msgid "got an invalid S-expression from libksba\n"
+msgstr "got an invalid S-expression from libksba\n"
+
+#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
+#, c-format
+msgid "converting S-expression failed: %s\n"
+msgstr "converting S-expression failed: %s\n"
+
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
+#, c-format
+msgid "creating S-expression failed: %s\n"
+msgstr "creating S-expression failed: %s\n"
+
+#: dirmngr/crlcache.c:1699
+#, c-format
+msgid "ksba_crl_parse failed: %s\n"
+msgstr "ksba_crl_parse failed: %s\n"
+
+#: dirmngr/crlcache.c:1714
+#, c-format
+msgid "error getting update times of CRL: %s\n"
+msgstr "error getting update times of CRL: %s\n"
+
+#: dirmngr/crlcache.c:1721
+#, c-format
+msgid "update times of this CRL: this=%s next=%s\n"
+msgstr "update times of this CRL: this=%s next=%s\n"
+
+#: dirmngr/crlcache.c:1725
+msgid "nextUpdate not given; assuming a validity period of one day\n"
+msgstr "nextUpdate not given; assuming a validity period of one day\n"
+
+#: dirmngr/crlcache.c:1745
+#, c-format
+msgid "error getting CRL item: %s\n"
+msgstr "error getting CRL item: %s\n"
+
+#: dirmngr/crlcache.c:1760
+#, c-format
+msgid "error inserting item into temporary cache file: %s\n"
+msgstr "error inserting item into temporary cache file: %s\n"
+
+#: dirmngr/crlcache.c:1787
+#, c-format
+msgid "no CRL issuer found in CRL: %s\n"
+msgstr "no CRL issuer found in CRL: %s\n"
+
+#: dirmngr/crlcache.c:1802
+msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
+msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
+
+#: dirmngr/crlcache.c:1847
+#, c-format
+msgid "CRL signature verification failed: %s\n"
+msgstr "CRL signature verification failed: %s\n"
+
+#: dirmngr/crlcache.c:1858
+#, c-format
+msgid "error checking validity of CRL issuer certificate: %s\n"
+msgstr "error checking validity of CRL issuer certificate: %s\n"
+
+#: dirmngr/crlcache.c:2001
+#, c-format
+msgid "ksba_crl_new failed: %s\n"
+msgstr "ksba_crl_new failed: %s\n"
+
+#: dirmngr/crlcache.c:2008
+#, c-format
+msgid "ksba_crl_set_reader failed: %s\n"
+msgstr "ksba_crl_set_reader failed: %s\n"
+
+#: dirmngr/crlcache.c:2042
+#, c-format
+msgid "removed stale temporary cache file '%s'\n"
+msgstr "removed stale temporary cache file ‘%s’\n"
+
+#: dirmngr/crlcache.c:2046
+#, c-format
+msgid "problem removing stale temporary cache file '%s': %s\n"
+msgstr "problem removing stale temporary cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:2056
+#, c-format
+msgid "error creating temporary cache file '%s': %s\n"
+msgstr "error creating temporary cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:2066
+#, c-format
+msgid "crl_parse_insert failed: %s\n"
+msgstr "crl_parse_insert failed: %s\n"
+
+#: dirmngr/crlcache.c:2076
+#, c-format
+msgid "error finishing temporary cache file '%s': %s\n"
+msgstr "error finishing temporary cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:2083
+#, c-format
+msgid "error closing temporary cache file '%s': %s\n"
+msgstr "error closing temporary cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:2108
+#, c-format
+msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
+msgstr "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
+
+#: dirmngr/crlcache.c:2112
+#, c-format
+msgid "new CRL still too old; it expired on %s\n"
+msgstr "new CRL still too old; it expired on %s\n"
+
+#: dirmngr/crlcache.c:2128
+#, c-format
+msgid "unknown critical CRL extension %s\n"
+msgstr "unknown critical CRL extension %s\n"
+
+#: dirmngr/crlcache.c:2138
+#, c-format
+msgid "error reading CRL extensions: %s\n"
+msgstr "error reading CRL extensions: %s\n"
+
+#: dirmngr/crlcache.c:2189
+#, c-format
+msgid "creating cache file '%s'\n"
+msgstr "creating cache file ‘%s’\n"
+
+#: dirmngr/crlcache.c:2221
+#, c-format
+msgid "problem renaming '%s' to '%s': %s\n"
+msgstr "problem renaming ‘%s’ to '%s': %s\n"
+
+#: dirmngr/crlcache.c:2235
+msgid ""
+"updating the DIR file failed - cache entry will get lost with the next "
+"program start\n"
+msgstr ""
+"updating the DIR file failed - cache entry will get lost with the next "
+"program start\n"
+
+#: dirmngr/crlcache.c:2272
+#, c-format
+msgid "Begin CRL dump (retrieved via %s)\n"
+msgstr "Begin CRL dump (retrieved via %s)\n"
+
+#: dirmngr/crlcache.c:2295
+msgid ""
+" ERROR: The CRL will not be used because it was still too old after an "
+"update!\n"
+msgstr ""
+" ERROR: The CRL will not be used because it was still too old after an "
+"update!\n"
+
+#: dirmngr/crlcache.c:2298
+msgid ""
+" ERROR: The CRL will not be used due to an unknown critical extension!\n"
+msgstr ""
+" ERROR: The CRL will not be used due to an unknown critical extension!\n"
+
+#: dirmngr/crlcache.c:2301
+msgid " ERROR: The CRL will not be used\n"
+msgstr " ERROR: The CRL will not be used\n"
+
+#: dirmngr/crlcache.c:2308
+msgid " ERROR: This cached CRL may have been tampered with!\n"
+msgstr " ERROR: This cached CRL may have been tampered with!\n"
+
+#: dirmngr/crlcache.c:2326
+msgid " WARNING: invalid cache record length\n"
+msgstr " WARNING: invalid cache record length\n"
+
+#: dirmngr/crlcache.c:2333
+#, c-format
+msgid "problem reading cache record: %s\n"
+msgstr "problem reading cache record: %s\n"
+
+#: dirmngr/crlcache.c:2344
+#, c-format
+msgid "problem reading cache key: %s\n"
+msgstr "problem reading cache key: %s\n"
+
+#: dirmngr/crlcache.c:2375
+#, c-format
+msgid "error reading cache entry from db: %s\n"
+msgstr "error reading cache entry from db: %s\n"
+
+#: dirmngr/crlcache.c:2378
+msgid "End CRL dump\n"
+msgstr "End CRL dump\n"
+
+#: dirmngr/crlcache.c:2499
+#, c-format
+msgid "crl_fetch via DP failed: %s\n"
+msgstr "crl_fetch via DP failed: %s\n"
+
+#: dirmngr/crlcache.c:2510
+#, c-format
+msgid "crl_cache_insert via DP failed: %s\n"
+msgstr "crl_cache_insert via DP failed: %s\n"
+
+#: dirmngr/crlcache.c:2570
+#, c-format
+msgid "crl_cache_insert via issuer failed: %s\n"
+msgstr "crl_cache_insert via issuer failed: %s\n"
+
+#: dirmngr/crlfetch.c:74
+msgid "reader to file mapping table full - waiting\n"
+msgstr "reader to file mapping table full - waiting\n"
+
+#: dirmngr/crlfetch.c:182
+msgid "using \"http\" instead of \"https\"\n"
+msgstr "using “http” instead of “https”\n"
+
+#: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
+#: dirmngr/crlfetch.c:359
+#, c-format
+msgid "CRL access not possible due to disabled %s\n"
+msgstr "CRL access not possible due to disabled %s\n"
+
+#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
+#: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
+#, c-format
+msgid "error initializing reader object: %s\n"
+msgstr "error initializing reader object: %s\n"
+
+#: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr "URL ‘%s’ redirected to ‘%s’ (%u)\n"
+
+#: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
+msgid "too many redirections\n"
+msgstr "too many redirections\n"
+
+#: dirmngr/crlfetch.c:274
+#, c-format
+msgid "error retrieving '%s': %s\n"
+msgstr "error retrieving '%s': %s\n"
+
+#: dirmngr/crlfetch.c:279
+#, c-format
+msgid "error retrieving '%s': http status %u\n"
+msgstr "error retrieving '%s': http status %u\n"
+
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
+msgid "CRL access not possible due to Tor mode\n"
+msgstr "CRL access not possible due to Tor mode\n"
+
+#: dirmngr/crlfetch.c:386
+#, c-format
+msgid "certificate search not possible due to disabled %s\n"
+msgstr "certificate search not possible due to disabled %s\n"
+
+#: dirmngr/dirmngr-client.c:71
+msgid "use OCSP instead of CRLs"
+msgstr "use OCSP instead of CRLs"
+
+#: dirmngr/dirmngr-client.c:72
+msgid "check whether a dirmngr is running"
+msgstr "check whether a dirmngr is running"
+
+#: dirmngr/dirmngr-client.c:73
+msgid "add a certificate to the cache"
+msgstr "add a certificate to the cache"
+
+#: dirmngr/dirmngr-client.c:74
+msgid "validate a certificate"
+msgstr "validate a certificate"
+
+#: dirmngr/dirmngr-client.c:75
+msgid "lookup a certificate"
+msgstr "lookup a certificate"
+
+#: dirmngr/dirmngr-client.c:76
+msgid "lookup only locally stored certificates"
+msgstr "lookup only locally stored certificates"
+
+#: dirmngr/dirmngr-client.c:77
+msgid "expect an URL for --lookup"
+msgstr "expect an URL for --lookup"
+
+#: dirmngr/dirmngr-client.c:78
+msgid "load a CRL into the dirmngr"
+msgstr "load a CRL into the dirmngr"
+
+#: dirmngr/dirmngr-client.c:79
+msgid "special mode for use by Squid"
+msgstr "special mode for use by Squid"
+
+#: dirmngr/dirmngr-client.c:80
+msgid "expect certificates in PEM format"
+msgstr "expect certificates in PEM format"
+
+#: dirmngr/dirmngr-client.c:82
+msgid "force the use of the default OCSP responder"
+msgstr "force the use of the default OCSP responder"
+
+#: dirmngr/dirmngr-client.c:169
+msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
+msgstr "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
+
+#: dirmngr/dirmngr-client.c:173
+msgid ""
+"Syntax: dirmngr-client [options] [certfile|pattern]\n"
+"Test an X.509 certificate against a CRL or do an OCSP check\n"
+"The process returns 0 if the certificate is valid, 1 if it is\n"
+"not valid and other error codes for general failures\n"
+msgstr ""
+"Syntax: dirmngr-client [options] [certfile|pattern]\n"
+"Test an X.509 certificate against a CRL or do an OCSP check\n"
+"The process returns 0 if the certificate is valid, 1 if it is\n"
+"not valid and other error codes for general failures\n"
+
+#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#, c-format
+msgid "error reading certificate from stdin: %s\n"
+msgstr "error reading certificate from stdin: %s\n"
+
+#: dirmngr/dirmngr-client.c:281
+#, c-format
+msgid "error reading certificate from '%s': %s\n"
+msgstr "error reading certificate from '%s': %s\n"
+
+#: dirmngr/dirmngr-client.c:295
+msgid "certificate too large to make any sense\n"
+msgstr "certificate too large to make any sense\n"
+
+#: dirmngr/dirmngr-client.c:310
+#, c-format
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "can't connect to the dirmngr: %s\n"
+
+#: dirmngr/dirmngr-client.c:332
+#, c-format
+msgid "lookup failed: %s\n"
+msgstr "lookup failed: %s\n"
+
+#: dirmngr/dirmngr-client.c:347
+#, c-format
+msgid "loading CRL '%s' failed: %s\n"
+msgstr "loading CRL ‘%s’ failed: %s\n"
+
+#: dirmngr/dirmngr-client.c:375
+msgid "a dirmngr daemon is up and running\n"
+msgstr "a dirmngr daemon is up and running\n"
+
+#: dirmngr/dirmngr-client.c:397
+#, c-format
+msgid "validation of certificate failed: %s\n"
+msgstr "validation of certificate failed: %s\n"
+
+#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+msgid "certificate is valid\n"
+msgstr "certificate is valid\n"
+
+#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+msgid "certificate has been revoked\n"
+msgstr "certificate has been revoked\n"
+
+#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#, c-format
+msgid "certificate check failed: %s\n"
+msgstr "certificate check failed: %s\n"
+
+#: dirmngr/dirmngr-client.c:428
+#, c-format
+msgid "got status: '%s'\n"
+msgstr "got status: ‘%s’\n"
+
+#: dirmngr/dirmngr-client.c:443
+#, c-format
+msgid "error writing base64 encoding: %s\n"
+msgstr "error writing base64 encoding: %s\n"
+
+#: dirmngr/dirmngr-client.c:701
+#, c-format
+msgid "unsupported inquiry '%s'\n"
+msgstr "unsupported inquiry ‘%s’\n"
+
+#: dirmngr/dirmngr-client.c:803
+msgid "absolute file name expected\n"
+msgstr "absolute file name expected\n"
+
+#: dirmngr/dirmngr-client.c:848
+#, c-format
+msgid "looking up '%s'\n"
+msgstr "looking up ‘%s’\n"
+
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr "run as windows service (background)"
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
+msgid "list the contents of the CRL cache"
+msgstr "list the contents of the CRL cache"
+
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
+msgid "|FILE|load CRL from FILE into cache"
+msgstr "|FILE|load CRL from FILE into cache"
+
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
+msgid "|URL|fetch a CRL from URL"
+msgstr "|URL|fetch a CRL from URL"
+
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
+msgid "shutdown the dirmngr"
+msgstr "shutdown the dirmngr"
+
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
+msgid "flush the cache"
+msgstr "flush the cache"
+
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|write server mode logs to FILE"
+
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
+msgid "run without asking a user"
+msgstr "run without asking a user"
+
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
+msgid "force loading of outdated CRLs"
+msgstr "force loading of outdated CRLs"
+
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
+msgid "allow sending OCSP requests"
+msgstr "allow sending OCSP requests"
+
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
+msgid "inhibit the use of HTTP"
+msgstr "inhibit the use of HTTP"
+
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
+msgid "inhibit the use of LDAP"
+msgstr "inhibit the use of LDAP"
+
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
+msgid "ignore HTTP CRL distribution points"
+msgstr "ignore HTTP CRL distribution points"
+
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignore LDAP CRL distribution points"
+
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignore certificate contained OCSP service URLs"
+
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
+msgid "|URL|redirect all HTTP requests to URL"
+msgstr "|URL|redirect all HTTP requests to URL"
+
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
+msgid "|HOST|use HOST for LDAP queries"
+msgstr "|HOST|use HOST for LDAP queries"
+
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
+msgid "do not use fallback hosts with --ldap-proxy"
+msgstr "do not use fallback hosts with --ldap-proxy"
+
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
+msgid "|FILE|read LDAP server list from FILE"
+msgstr "|FILE|read LDAP server list from FILE"
+
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
+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:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
+msgid "|N|set LDAP timeout to N seconds"
+msgstr "|N|set LDAP timeout to N seconds"
+
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
+msgid "|URL|use OCSP responder at URL"
+msgstr "|URL|use OCSP responder at URL"
+
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
+msgid "|FPR|OCSP response signed by FPR"
+msgstr "|FPR|OCSP response signed by FPR"
+
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
+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:222
++#: dirmngr/dirmngr.c:209
+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:224
++#: dirmngr/dirmngr.c:211
+msgid "route all network traffic via Tor"
+msgstr "route all network traffic via Tor"
+
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
+msgid ""
+"@\n"
+"(See the \"info\" manual for a complete listing of all commands and "
+"options)\n"
+msgstr ""
+"@\n"
+"(See the “info” manual for a complete listing of all commands and options)\n"
+
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
+msgid "Usage: @DIRMNGR@ [options] (-h for help)"
+msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
+
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
+msgid ""
+"Syntax: @DIRMNGR@ [options] [command [args]]\n"
+"Keyserver, CRL, and OCSP access for @GNUPG@\n"
+msgstr ""
+"Syntax: @DIRMNGR@ [options] [command [args]]\n"
+"Keyserver, CRL, and OCSP access for @GNUPG@\n"
+
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
+#, c-format
+msgid "valid debug levels are: %s\n"
+msgstr "valid debug levels are: %s\n"
+
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
+#, c-format
+msgid "usage: %s [options] "
+msgstr "usage: %s [options] "
+
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
+msgid "colons are not allowed in the socket name\n"
+msgstr "colons are not allowed in the socket name\n"
+
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
+#, c-format
+msgid "fetching CRL from '%s' failed: %s\n"
+msgstr "fetching CRL from ‘%s’ failed: %s\n"
+
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
+#, c-format
+msgid "processing CRL from '%s' failed: %s\n"
+msgstr "processing CRL from ‘%s’ failed: %s\n"
+
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
+#, c-format
+msgid "%s:%u: line too long - skipped\n"
+msgstr "%s:%u: line too long - skipped\n"
+
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
+#, c-format
+msgid "%s:%u: invalid fingerprint detected\n"
+msgstr "%s:%u: invalid fingerprint detected\n"
+
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
+#, c-format
+msgid "%s:%u: read error: %s\n"
+msgstr "%s:%u: read error: %s\n"
+
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
+#, 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:1807
++#: dirmngr/dirmngr.c:1631
+msgid "SIGHUP received - re-reading configuration and flushing caches\n"
+msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
+
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
+msgid "SIGUSR2 received - no action defined\n"
+msgstr "SIGUSR2 received - no action defined\n"
+
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
+msgid "SIGTERM received - shutting down ...\n"
+msgstr "SIGTERM received - shutting down ...\n"
+
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
+#, c-format
+msgid "SIGTERM received - still %d active connections\n"
+msgstr "SIGTERM received - still %d active connections\n"
+
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
+msgid "shutdown forced\n"
+msgstr "shutdown forced\n"
+
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
+msgid "SIGINT received - immediate shutdown\n"
+msgstr "SIGINT received - immediate shutdown\n"
+
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
+#, c-format
+msgid "signal %d received - no action defined\n"
+msgstr "signal %d received - no action defined\n"
+
+#: dirmngr/dirmngr_ldap.c:138
+msgid "return all values in a record oriented format"
+msgstr "return all values in a record oriented format"
+
+#: dirmngr/dirmngr_ldap.c:141
+msgid "|NAME|ignore host part and connect through NAME"
+msgstr "|NAME|ignore host part and connect through NAME"
+
+#: dirmngr/dirmngr_ldap.c:142
+msgid "|NAME|connect to host NAME"
+msgstr "|NAME|connect to host NAME"
+
+#: dirmngr/dirmngr_ldap.c:143
+msgid "|N|connect to port N"
+msgstr "|N|connect to port N"
+
+#: dirmngr/dirmngr_ldap.c:144
+msgid "|NAME|use user NAME for authentication"
+msgstr "|NAME|use user NAME for authentication"
+
+#: dirmngr/dirmngr_ldap.c:145
+msgid "|PASS|use password PASS for authentication"
+msgstr "|PASS|use password PASS for authentication"
+
+#: dirmngr/dirmngr_ldap.c:147
+msgid "take password from $DIRMNGR_LDAP_PASS"
+msgstr "take password from $DIRMNGR_LDAP_PASS"
+
+#: dirmngr/dirmngr_ldap.c:148
+msgid "|STRING|query DN STRING"
+msgstr "|STRING|query DN STRING"
+
+#: dirmngr/dirmngr_ldap.c:149
+msgid "|STRING|use STRING as filter expression"
+msgstr "|STRING|use STRING as filter expression"
+
+#: dirmngr/dirmngr_ldap.c:150
+msgid "|STRING|return the attribute STRING"
+msgstr "|STRING|return the attribute STRING"
+
+#: dirmngr/dirmngr_ldap.c:209
+msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+msgstr "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+
+#: dirmngr/dirmngr_ldap.c:212
+msgid ""
+"Syntax: dirmngr_ldap [options] [URL]\n"
+"Internal LDAP helper for Dirmngr\n"
+"Interface and options may change without notice\n"
+msgstr ""
+"Syntax: dirmngr_ldap [options] [URL]\n"
+"Internal LDAP helper for Dirmngr\n"
+"Interface and options may change without notice\n"
+
+#: dirmngr/dirmngr_ldap.c:337
+#, c-format
+msgid "invalid port number %d\n"
+msgstr "invalid port number %d\n"
+
+#: dirmngr/dirmngr_ldap.c:413
+#, c-format
+msgid "scanning result for attribute '%s'\n"
+msgstr "scanning result for attribute ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
+#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
+#: dirmngr/dirmngr_ldap.c:677
+#, c-format
+msgid "error writing to stdout: %s\n"
+msgstr "error writing to stdout: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:437
+#, c-format
+msgid " available attribute '%s'\n"
+msgstr " available attribute ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:475
+#, c-format
+msgid "attribute '%s' not found\n"
+msgstr "attribute ‘%s’ not found\n"
+
+#: dirmngr/dirmngr_ldap.c:482
+#, c-format
+msgid "found attribute '%s'\n"
+msgstr "found attribute ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:591
+#, c-format
+msgid "processing url '%s'\n"
+msgstr "processing url ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:593
+#, c-format
+msgid " user '%s'\n"
+msgstr " user ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:595
+#, c-format
+msgid " pass '%s'\n"
+msgstr " pass ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:597
+#, c-format
+msgid " host '%s'\n"
+msgstr " host ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:598
+#, c-format
+msgid " port %d\n"
+msgstr " port %d\n"
+
+#: dirmngr/dirmngr_ldap.c:600
+#, c-format
+msgid " DN '%s'\n"
+msgstr " DN ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:602
+#, c-format
+msgid " filter '%s'\n"
+msgstr " filter ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:607 dirmngr/dirmngr_ldap.c:610
+#, c-format
+msgid " attr '%s'\n"
+msgstr " attr ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:616
+#, c-format
+msgid "no host name in '%s'\n"
+msgstr "no host name in ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:621
+#, c-format
+msgid "no attribute given for query '%s'\n"
+msgstr "no attribute given for query ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:627
+msgid "WARNING: using first attribute only\n"
+msgstr "WARNING: using first attribute only\n"
+
+#: dirmngr/dirmngr_ldap.c:636
+#, c-format
+msgid "LDAP init to '%s:%d' failed: %s\n"
+msgstr "LDAP init to ‘%s:%d’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:659
+#, c-format
+msgid "binding to '%s:%d' failed: %s\n"
+msgstr "binding to ‘%s:%d’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:686
+#, c-format
+msgid "searching '%s' failed: %s\n"
+msgstr "searching ‘%s’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:718
+#, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "‘%s’ is not an LDAP URL\n"
+
+#: dirmngr/dirmngr_ldap.c:724
+#, c-format
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr "‘%s’ is an invalid LDAP URL\n"
+
+#: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
+#: dirmngr/ldap-wrapper.c:693
+#, 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:502
+#, c-format
+msgid "malloc failed: %s\n"
+msgstr "malloc failed: %s\n"
+
+#: dirmngr/ldap.c:627
+#, c-format
+msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgstr "start_cert_fetch: invalid pattern ‘%s’\n"
+
+#: dirmngr/ldap.c:840
+msgid "ldap_search hit the size limit of the server\n"
+msgstr "ldap_search hit the size limit of the server\n"
+
+#: dirmngr/misc.c:170
+msgid "invalid canonical S-expression found\n"
+msgstr "invalid canonical S-expression found\n"
+
+#: dirmngr/misc.c:194 dirmngr/misc.c:228
+#, c-format
+msgid "gcry_md_open failed: %s\n"
+msgstr "gcry_md_open failed: %s\n"
+
+#: dirmngr/misc.c:199 dirmngr/misc.c:233
+#, c-format
+msgid "oops: ksba_cert_hash failed: %s\n"
+msgstr "oops: ksba_cert_hash failed: %s\n"
+
+#: dirmngr/misc.c:518
+msgid "bad URL encoding detected\n"
+msgstr "bad URL encoding detected\n"
+
+#: dirmngr/ocsp.c:80
+#, c-format
+msgid "error reading from responder: %s\n"
+msgstr "error reading from responder: %s\n"
+
+#: dirmngr/ocsp.c:98
+#, c-format
+msgid "response from server too large; limit is %d bytes\n"
+msgstr "response from server too large; limit is %d bytes\n"
+
+#: dirmngr/ocsp.c:139
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "OCSP request not possible due to Tor mode\n"
+
+#: dirmngr/ocsp.c:145
+msgid "OCSP request not possible due to disabled HTTP\n"
+msgstr "OCSP request not possible due to disabled HTTP\n"
+
+#: dirmngr/ocsp.c:152
+#, c-format
+msgid "error setting OCSP target: %s\n"
+msgstr "error setting OCSP target: %s\n"
+
+#: dirmngr/ocsp.c:170
+#, c-format
+msgid "error building OCSP request: %s\n"
+msgstr "error building OCSP request: %s\n"
+
+#: dirmngr/ocsp.c:181
+#, c-format
+msgid "error connecting to '%s': %s\n"
+msgstr "error connecting to '%s': %s\n"
+
+#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
+#, c-format
+msgid "error reading HTTP response for '%s': %s\n"
+msgstr "error reading HTTP response for '%s': %s\n"
+
+#: dirmngr/ocsp.c:240
+#, c-format
+msgid "error accessing '%s': http status %u\n"
+msgstr "error accessing '%s': http status %u\n"
+
+#: dirmngr/ocsp.c:265
+#, c-format
+msgid "error parsing OCSP response for '%s': %s\n"
+msgstr "error parsing OCSP response for '%s': %s\n"
+
+#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
+#, c-format
+msgid "OCSP responder at '%s' status: %s\n"
+msgstr "OCSP responder at ‘%s’ status: %s\n"
+
+#: dirmngr/ocsp.c:293
+#, c-format
+msgid "hashing the OCSP response for '%s' failed: %s\n"
+msgstr "hashing the OCSP response for ‘%s’ failed: %s\n"
+
+#: dirmngr/ocsp.c:328
+msgid "not signed by a default OCSP signer's certificate"
+msgstr "not signed by a default OCSP signer's certificate"
+
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
+msgid "only SHA-1 is supported for OCSP responses\n"
+msgstr "only SHA-1 is supported for OCSP responses\n"
+
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
+#, c-format
+msgid "allocating list item failed: %s\n"
+msgstr "allocating list item failed: %s\n"
+
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
+#, c-format
+msgid "error getting responder ID: %s\n"
+msgstr "error getting responder ID: %s\n"
+
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
+msgid "no suitable certificate found to verify the OCSP response\n"
+msgstr "no suitable certificate found to verify the OCSP response\n"
+
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
+#, c-format
+msgid "issuer certificate not found: %s\n"
+msgstr "issuer certificate not found: %s\n"
+
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
+msgid "caller did not return the target certificate\n"
+msgstr "caller did not return the target certificate\n"
+
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
+msgid "caller did not return the issuing certificate\n"
+msgstr "caller did not return the issuing certificate\n"
+
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
+#, c-format
+msgid "failed to allocate OCSP context: %s\n"
+msgstr "failed to allocate OCSP context: %s\n"
+
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "can't get authorityInfoAccess: %s\n"
+
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
+msgid "no default OCSP responder defined\n"
+msgstr "no default OCSP responder defined\n"
+
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
+msgid "no default OCSP signer defined\n"
+msgstr "no default OCSP signer defined\n"
+
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
+#, c-format
+msgid "using default OCSP responder '%s'\n"
+msgstr "using default OCSP responder ‘%s’\n"
+
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
+#, c-format
+msgid "using OCSP responder '%s'\n"
+msgstr "using OCSP responder ‘%s’\n"
+
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
+#, c-format
+msgid "failed to establish a hashing context for OCSP: %s\n"
+msgstr "failed to establish a hashing context for OCSP: %s\n"
+
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
+#, c-format
+msgid "error getting OCSP status for target certificate: %s\n"
+msgstr "error getting OCSP status for target certificate: %s\n"
+
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
+#, c-format
+msgid "certificate status is: %s (this=%s next=%s)\n"
+msgstr "certificate status is: %s (this=%s next=%s)\n"
+
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
+msgid "good"
+msgstr "good"
+
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
+#, c-format
+msgid "certificate has been revoked at: %s due to: %s\n"
+msgstr "certificate has been revoked at: %s due to: %s\n"
+
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
+msgid "OCSP responder returned a status in the future\n"
+msgstr "OCSP responder returned a status in the future\n"
+
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
+msgid "OCSP responder returned a non-current status\n"
+msgstr "OCSP responder returned a non-current status\n"
+
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
+msgid "OCSP responder returned an too old status\n"
+msgstr "OCSP responder returned an too old status\n"
+
+#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
+#, c-format
+msgid "assuan_inquire(%s) failed: %s\n"
+msgstr "assuan_inquire(%s) failed: %s\n"
+
+#: dirmngr/server.c:893
+msgid "ldapserver missing"
+msgstr "ldapserver missing"
+
+#: dirmngr/server.c:967
+msgid "serialno missing in cert ID"
+msgstr "serialno missing in cert ID"
+
+#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
+#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
+#, c-format
+msgid "assuan_inquire failed: %s\n"
+msgstr "assuan_inquire failed: %s\n"
+
+#: dirmngr/server.c:1232
+#, c-format
+msgid "fetch_cert_by_url failed: %s\n"
+msgstr "fetch_cert_by_url failed: %s\n"
+
+#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
+#, c-format
+msgid "error sending data: %s\n"
+msgstr "error sending data: %s\n"
+
+#: dirmngr/server.c:1382
+#, c-format
+msgid "start_cert_fetch failed: %s\n"
+msgstr "start_cert_fetch failed: %s\n"
+
+#: dirmngr/server.c:1415
+#, c-format
+msgid "fetch_next_cert failed: %s\n"
+msgstr "fetch_next_cert failed: %s\n"
+
+#: dirmngr/server.c:1442
+#, c-format
+msgid "max_replies %d exceeded\n"
+msgstr "max_replies %d exceeded\n"
+
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
+#, c-format
+msgid "can't allocate control structure: %s\n"
+msgstr "can't allocate control structure: %s\n"
+
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "failed to allocate assuan context: %s\n"
+
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
+#, c-format
+msgid "failed to initialize the server: %s\n"
+msgstr "failed to initialize the server: %s\n"
+
- #: dirmngr/server.c:2444
++#: dirmngr/server.c:2406
+#, 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:2475
++#: dirmngr/server.c:2437
+#, c-format
+msgid "Assuan accept problem: %s\n"
+msgstr "Assuan accept problem: %s\n"
+
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
+#, c-format
+msgid "Assuan processing failed: %s\n"
+msgstr "Assuan processing failed: %s\n"
+
+#: dirmngr/validate.c:201
+msgid "accepting root CA not marked as a CA"
+msgstr "accepting root CA not marked as a CA"
+
+#: dirmngr/validate.c:227
+msgid "CRL checking too deeply nested\n"
+msgstr "CRL checking too deeply nested\n"
+
+#: dirmngr/validate.c:245
+msgid "not checking CRL for"
+msgstr "not checking CRL for"
+
+#: dirmngr/validate.c:250
+msgid "checking CRL for"
+msgstr "checking CRL for"
+
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr "running in compatibility mode - certificate chain not checked!\n"
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
+msgid "selfsigned certificate has a BAD signature"
+msgstr "selfsigned certificate has a BAD signature"
+
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
+#, c-format
+msgid "checking trustworthiness of root certificate failed: %s\n"
+msgstr "checking trustworthiness of root certificate failed: %s\n"
+
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
+msgid "certificate chain is good\n"
+msgstr "certificate chain is good\n"
+
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA requires the use of a 160 bit hash algorithm\n"
+
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
+msgid "certificate should not have been used for CRL signing\n"
+msgstr "certificate should not have been used for CRL signing\n"
+
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
+msgid "quiet"
+msgstr "quiet"
+
+#: tools/gpg-connect-agent.c:79
+msgid "print data out hex encoded"
+msgstr "print data out hex encoded"
+
+#: tools/gpg-connect-agent.c:80
+msgid "decode received data lines"
+msgstr "decode received data lines"
+
+#: tools/gpg-connect-agent.c:81
+msgid "connect to the dirmngr"
+msgstr "connect to the dirmngr"
+
+#: tools/gpg-connect-agent.c:84
+msgid "|NAME|connect to Assuan socket NAME"
+msgstr "|NAME|connect to Assuan socket NAME"
+
+#: tools/gpg-connect-agent.c:86
+msgid "|ADDR|connect to Assuan server at ADDR"
+msgstr "|ADDR|connect to Assuan server at ADDR"
+
+#: tools/gpg-connect-agent.c:88
+msgid "run the Assuan server given on the command line"
+msgstr "run the Assuan server given on the command line"
+
+#: tools/gpg-connect-agent.c:90
+msgid "do not use extended connect mode"
+msgstr "do not use extended connect mode"
+
+#: tools/gpg-connect-agent.c:92
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|FILE|run commands from FILE on startup"
+
+#: tools/gpg-connect-agent.c:93
+msgid "run /subst on startup"
+msgstr "run /subst on startup"
+
+#: tools/gpg-connect-agent.c:205
+msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
+msgstr "Usage: @GPG at -connect-agent [options] (-h for help)"
+
+#: tools/gpg-connect-agent.c:208
+msgid ""
+"Syntax: @GPG at -connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+"Syntax: @GPG at -connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+
+#: tools/gpg-connect-agent.c:1247
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr "option “%s” requires a program and optional arguments\n"
+
+#: tools/gpg-connect-agent.c:1258 tools/gpg-connect-agent.c:1264
+#: tools/gpg-connect-agent.c:1270
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr "option “%s” ignored due to “%s”\n"
+
+#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
+#, c-format
+msgid "receiving line failed: %s\n"
+msgstr "receiving line failed: %s\n"
+
+#: tools/gpg-connect-agent.c:1458
+msgid "line too long - skipped\n"
+msgstr "line too long - skipped\n"
+
+#: tools/gpg-connect-agent.c:1462
+msgid "line shortened due to embedded Nul character\n"
+msgstr "line shortened due to embedded Nul character\n"
+
+#: tools/gpg-connect-agent.c:1837
+#, c-format
+msgid "unknown command '%s'\n"
+msgstr "unknown command ‘%s’\n"
+
+#: tools/gpg-connect-agent.c:1855
+#, c-format
+msgid "sending line failed: %s\n"
+msgstr "sending line failed: %s\n"
+
+#: tools/gpg-connect-agent.c:2251
+#, c-format
+msgid "error sending standard options: %s\n"
+msgstr "error sending standard options: %s\n"
+
+#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
+#: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
+msgid "Options controlling the diagnostic output"
+msgstr "Options controlling the diagnostic output"
+
+#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
+#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
+msgid "Options controlling the configuration"
+msgstr "Options controlling the configuration"
+
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
+#: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
+msgid "Options useful for debugging"
+msgstr "Options useful for debugging"
+
+#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
+msgid "Options controlling the security"
+msgstr "Options controlling the security"
+
+#: tools/gpgconf-comp.c:528
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|expire SSH keys after N seconds"
+
+#: tools/gpgconf-comp.c:532
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|set maximum PIN cache lifetime to N seconds"
+
+#: tools/gpgconf-comp.c:536
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|set maximum SSH key lifetime to N seconds"
+
+#: tools/gpgconf-comp.c:560
+msgid "Options enforcing a passphrase policy"
+msgstr "Options enforcing a passphrase policy"
+
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
- msgstr "do not allow to bypass the passphrase policy"
++msgid "do not allow bypassing the passphrase policy"
++msgstr "do not allow bypassing the passphrase policy"
+
+#: tools/gpgconf-comp.c:567
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr "|N|set minimal required length for new passphrases to N"
+
+#: tools/gpgconf-comp.c:571
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr "|N|require at least N non-alpha characters for a new passphrase"
+
+#: tools/gpgconf-comp.c:575
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|check new passphrases against pattern in FILE"
+
+#: tools/gpgconf-comp.c:579
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|expire the passphrase after N days"
+
+#: tools/gpgconf-comp.c:583
+msgid "do not allow the reuse of old passphrases"
+msgstr "do not allow the reuse of old passphrases"
+
+#: tools/gpgconf-comp.c:587
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|set the Pinentry timeout to N seconds"
+
+#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|use NAME as default secret key"
+
+#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|encrypt to user ID NAME as well"
+
+#: tools/gpgconf-comp.c:704
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|set up email aliases"
+
+#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
+msgid "Configuration for Keyservers"
+msgstr "Configuration for Keyservers"
+
+#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|use keyserver at URL"
+
+#: tools/gpgconf-comp.c:735
+msgid "allow PKA lookups (DNS requests)"
+msgstr "allow PKA lookups (DNS requests)"
+
+#: tools/gpgconf-comp.c:738
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+
+#: tools/gpgconf-comp.c:787
+msgid "disable all access to the dirmngr"
+msgstr "disable all access to the dirmngr"
+
+#: tools/gpgconf-comp.c:790
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
+
+#: tools/gpgconf-comp.c:820
+msgid "do not check CRLs for root certificates"
+msgstr "do not check CRLs for root certificates"
+
+#: tools/gpgconf-comp.c:869
+msgid "Options controlling the format of the output"
+msgstr "Options controlling the format of the output"
+
+#: tools/gpgconf-comp.c:905
+msgid "Options controlling the interactivity and enforcement"
+msgstr "Options controlling the interactivity and enforcement"
+
+#: tools/gpgconf-comp.c:915
+msgid "Options controlling the use of Tor"
+msgstr "Options controlling the use of Tor"
+
+#: tools/gpgconf-comp.c:929
+msgid "Configuration for HTTP servers"
+msgstr "Configuration for HTTP servers"
+
+#: tools/gpgconf-comp.c:940
+msgid "use system's HTTP proxy setting"
+msgstr "use system's HTTP proxy setting"
+
+#: tools/gpgconf-comp.c:945
+msgid "Configuration of LDAP servers to use"
+msgstr "Configuration of LDAP servers to use"
+
+#: tools/gpgconf-comp.c:974
+msgid "LDAP server list"
+msgstr "LDAP server list"
+
+#: tools/gpgconf-comp.c:982
+msgid "Configuration for OCSP"
+msgstr "Configuration for OCSP"
+
+#: tools/gpgconf-comp.c:1063
+msgid "GPG for OpenPGP"
+msgstr "GPG for OpenPGP"
+
+#: tools/gpgconf-comp.c:1064
+msgid "GPG Agent"
+msgstr "GPG Agent"
+
+#: tools/gpgconf-comp.c:1065
+msgid "Smartcard Daemon"
+msgstr "Smartcard Daemon"
+
+#: tools/gpgconf-comp.c:1066
+msgid "GPG for S/MIME"
+msgstr "GPG for S/MIME"
+
+#: tools/gpgconf-comp.c:1067
+msgid "Key Acquirer"
+msgstr "Key Acquirer"
+
+#: tools/gpgconf-comp.c:1068
+msgid "PIN and Passphrase Entry"
+msgstr "PIN and Passphrase Entry"
+
+#: tools/gpgconf-comp.c:1182
+msgid "Component not suitable for launching"
+msgstr "Component not suitable for launching"
+
+#: tools/gpgconf-comp.c:3240
+#, c-format
+msgid "External verification of component %s failed"
+msgstr "External verification of component %s failed"
+
+#: tools/gpgconf-comp.c:3391
+msgid "Note that group specifications are ignored\n"
+msgstr "Note that group specifications are ignored\n"
+
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
+msgid "list all components"
+msgstr "list all components"
+
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
+msgid "check all programs"
+msgstr "check all programs"
+
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
+msgid "|COMPONENT|list options"
+msgstr "|COMPONENT|list options"
+
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
+msgid "|COMPONENT|change options"
+msgstr "|COMPONENT|change options"
+
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
+msgid "|COMPONENT|check options"
+msgstr "|COMPONENT|check options"
+
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
+msgid "apply global default values"
+msgstr "apply global default values"
+
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
+msgid "get the configuration directories for @GPGCONF@"
+msgstr "get the configuration directories for @GPGCONF@"
+
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
+msgid "list global configuration file"
+msgstr "list global configuration file"
+
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
+msgid "check global configuration file"
+msgstr "check global configuration file"
+
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
+msgid "reload all or a given component"
+msgstr "reload all or a given component"
+
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
+msgid "launch a given component"
+msgstr "launch a given component"
+
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
+msgid "kill a given component"
+msgstr "kill a given component"
+
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
+msgid "use as output file"
+msgstr "use as output file"
+
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
+msgid "activate changes at runtime, if possible"
+msgstr "activate changes at runtime, if possible"
+
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
+msgid "Usage: @GPGCONF@ [options] (-h for help)"
+msgstr "Usage: @GPGCONF@ [options] (-h for help)"
+
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
+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:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
+msgid "Need one component argument"
+msgstr "Need one component argument"
+
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
+msgid "Component not found"
+msgstr "Component not found"
+
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
+msgid "No argument allowed"
+msgstr "No argument allowed"
+
+#: tools/symcryptrun.c:154
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@\n"
+"Commands:\n"
+" "
+
+#: tools/symcryptrun.c:156
+msgid "decryption modus"
+msgstr "decryption modus"
+
+#: tools/symcryptrun.c:157
+msgid "encryption modus"
+msgstr "encryption modus"
+
+#: tools/symcryptrun.c:161
+msgid "tool class (confucius)"
+msgstr "tool class (confucius)"
+
+#: tools/symcryptrun.c:162
+msgid "program filename"
+msgstr "program filename"
+
+#: tools/symcryptrun.c:164
+msgid "secret key file (required)"
+msgstr "secret key file (required)"
+
+#: tools/symcryptrun.c:165
+msgid "input file name (default stdin)"
+msgstr "input file name (default stdin)"
+
+#: tools/symcryptrun.c:209
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Usage: symcryptrun [options] (-h for help)"
+
+#: tools/symcryptrun.c:212
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
+#, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s on %s aborted with status %i\n"
+
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
+#, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "%s on %s failed with status %i\n"
+
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
+#, c-format
+msgid "can't create temporary directory '%s': %s\n"
+msgstr "can't create temporary directory '%s': %s\n"
+
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
+#, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "could not open %s for writing: %s\n"
+
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
+#, c-format
+msgid "error writing to %s: %s\n"
+msgstr "error writing to %s: %s\n"
+
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
+#, c-format
+msgid "error reading from %s: %s\n"
+msgstr "error reading from %s: %s\n"
+
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
+#, c-format
+msgid "error closing %s: %s\n"
+msgstr "error closing %s: %s\n"
+
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
+msgid "no --program option provided\n"
+msgstr "no --program option provided\n"
+
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr "only --decrypt and --encrypt are supported\n"
+
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
+msgid "no --keyfile option provided\n"
+msgstr "no --keyfile option provided\n"
+
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
+msgid "cannot allocate args vector\n"
+msgstr "cannot allocate args vector\n"
+
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
+#, c-format
+msgid "could not create pipe: %s\n"
+msgstr "could not create pipe: %s\n"
+
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
+#, c-format
+msgid "could not create pty: %s\n"
+msgstr "could not create pty: %s\n"
+
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
+#, c-format
+msgid "could not fork: %s\n"
+msgstr "could not fork: %s\n"
+
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
+#, c-format
+msgid "execv failed: %s\n"
+msgstr "execv failed: %s\n"
+
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
+#, c-format
+msgid "select failed: %s\n"
+msgstr "select failed: %s\n"
+
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
+#, c-format
+msgid "read failed: %s\n"
+msgstr "read failed: %s\n"
+
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
+#, c-format
+msgid "pty read failed: %s\n"
+msgstr "pty read failed: %s\n"
+
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
+#, c-format
+msgid "waitpid failed: %s\n"
+msgstr "waitpid failed: %s\n"
+
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr "child aborted with status %i\n"
+
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
+#, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "cannot allocate infile string: %s\n"
+
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
+#, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "cannot allocate outfile string: %s\n"
+
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr "either %s or %s must be given\n"
+
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
+msgid "no class provided\n"
+msgstr "no class provided\n"
+
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
+#, c-format
+msgid "class %s is not supported\n"
+msgstr "class %s is not supported\n"
+
+#: tools/gpg-check-pattern.c:144
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+
+#: tools/gpg-check-pattern.c:147
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
diff --cc po/eo.po
index 6848170,686e1ff..64178b6
--- a/po/eo.po
+++ b/po/eo.po
@@@ -8,7 -8,6 +8,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.0.6d\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2002-04-14 14:33+0100\n"
"Last-Translator: Edmund GRIMLEY EVANS <edmundo at rano.org>\n"
"Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
@@@ -101,14 -85,10 +101,14 @@@ msgstr "Bonvolu doni la pasfrazon; tio
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
#, fuzzy
msgid "Passphrase:"
msgstr "malbona pasfrazo"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr ""
@@@ -153,98 -125,70 +153,98 @@@ msgstr "malbona MPI
msgid "Bad Passphrase"
msgstr "malbona pasfrazo"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "protekto-metodo %d%s ne estas realigita\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, 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:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
msgstr "ne povas malfermi '%s': %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, fuzzy, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, fuzzy, c-format
msgid "shadowing the key failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, fuzzy, c-format
msgid "error writing key: %s\n"
msgstr "eraro dum skribado de �losilaro '%s': %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "�an�i la pasfrazon"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
"%s%%0Awithin gpg-agent's key storage"
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: malsukcesis krei haktabelon: %s\n"
@@@ -386,8 -304,6 +386,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "�an�i la pasfrazon"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -397,118 -313,87 +397,118 @@@ msgstr "
"Opcioj:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detala eligo"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "iom malpli da informoj"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "ser�i �losilojn �e �losilservilo"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "aktualigi la fido-datenaron"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, 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:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
#, fuzzy
msgid "allow presetting passphrase"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "ne realigita"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -517,132 -402,90 +517,124 @@@ 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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Bonvolu raporti cimojn al <gnupg-bugs at gnu.org>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr ""
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "opcio-dosiero '%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, 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:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, fuzzy, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "ne povas krei %s: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, fuzzy, c-format
msgid "socket name '%s' is too long\n"
msgstr "Valida atestilrevoko"
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
#, 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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, fuzzy, c-format
msgid "can't create directory '%s': %s\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
- #: agent/gpg-agent.c:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: dosierujo kreita\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
@@@ -657,28 -498,22 +649,28 @@@ msgstr "
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2390
++#: agent/gpg-agent.c:2392
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "aktualigo de sekreto malsukcesis: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu �losiloj ignoritaj\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
@@@ -694,8 -527,6 +686,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -703,9 -534,6 +695,9 @@@ msgstr "
"@Komandoj:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -726,40 -552,33 +718,40 @@@ msgid "
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
#, fuzzy
msgid "cancelled\n"
msgstr "nuligita de uzanto\n"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, fuzzy, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
@@@ -929,42 -719,30 +921,42 @@@ msgstr "protekto-metodo %d%s ne estas r
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "protekto-metodo %d%s ne estas realigita\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "eraro dum legado de '%s': %s\n"
@@@ -979,37 -755,15 +971,18 @@@ msgstr "eraro dum skribado de sekreta �
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "ne povas konekti�i al '%s': %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "komunikproblemo kun gpg-agent\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
#, fuzzy
msgid "problem setting the gpg-agent options\n"
msgstr "problemo kun agento: agento redonas 0x%lx\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- #, fuzzy
- msgid "canceled by user\n"
- msgstr "nuligita de uzanto\n"
-
- #: common/simple-pwquery.c:579
- #, fuzzy
- msgid "problem with the agent\n"
- msgstr "problemo kun agento: agento redonas 0x%lx\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "problemo kun agento: agento redonas 0x%lx\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "ne povas mal�alti kreadon de core-dosieroj: %s\n"
@@@ -1096,7 -833,6 +1069,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1120,17 -852,14 +1093,17 @@@ msgstr "
msgid "connection to agent is in restricted mode\n"
msgstr "ne povas fari tion en neinteraga re�imo\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr ""
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1428,7 -1097,6 +1401,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
#, fuzzy
msgid "out of core\n"
msgstr "ne traktita"
@@@ -1487,7 -1144,10 +1460,13 @@@ msgstr "publika �losilo %08lX ne trovit
msgid "waiting for lock %s...\n"
msgstr "skribas sekretan �losilon al '%s'\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr ""
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "kiraso: %s\n"
@@@ -1737,10 -1342,6 +1716,10 @@@ msgstr "skribas publikan �losilon al '%
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
@@@ -2039,27 -1575,18 +2018,27 @@@ msgstr "skribas sekretan �losilon al '%
msgid "Invalid command (try \"help\")\n"
msgstr "Nevalida komando (provu per \"helpo\")\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output ne funkcias por �i tiu komando\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "ne povas malfermi '%s'\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "�losilo '%s' ne trovita: %s\n"
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "eraro dum legado de �losilbloko: %s\n"
@@@ -2120,62 -1635,51 +2099,62 @@@ msgstr "estas sekreta �losilo por la pu
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr ""
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, fuzzy, c-format
msgid "using cipher %s\n"
msgstr "subskribado malsukcesis: %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "'%s' jam densigita\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "legas el '%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, fuzzy, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s-�ifrita por: %s\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, fuzzy, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
@@@ -2282,8 -1765,6 +2261,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: ignorita: %s\n"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2320,8 -1794,6 +2299,8 @@@ msgstr "eraro dum kreado de '%s': %s\n
msgid "[User ID not found]"
msgstr "[Uzantidentigilo ne trovita]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "nevalida kiraso"
@@@ -2390,218 -1849,169 +2369,218 @@@ msgstr "Nevalida �losilo %08lX validigi
msgid "using subkey %s instead of primary key %s\n"
msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "fari apartan subskribon"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
#, fuzzy
msgid "make a clear text signature"
msgstr "|[dosiero]|fari klartekstan subskribon"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "fari apartan subskribon"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "�ifri datenojn"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "�ifri nur kun simetria �ifro"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "mal�ifri datenojn (implicita elekto)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "kontroli subskribon"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "listigi �losilojn"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "listigi �losilojn kaj subskribojn"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "list and check key signatures"
msgstr "kontroli �losilsubskribojn"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "listigi �losilojn kaj fingro�purojn"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "listigi sekretajn �losilojn"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "krei novan �losilparon"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "krei novan �losilparon"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "krei novan �losilparon"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "krei novan �losilparon"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "krei revokatestilon"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "forigi �losilojn de la publika �losilaro"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "forigi �losilojn de la sekreta �losilaro"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "subskribi �losilon"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "subskribi �losilon loke"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "subskribi �losilon"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "subskribi �losilon loke"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "subskribi a� redakti �losilon"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "�an�i la pasfrazon"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "eksporti �losilojn"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "eksporti �losilojn al �losilservilo"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "importi �losilojn de �losilservilo"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "ser�i �losilojn �e �losilservilo"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "aktualigi �iujn �losilojn de �losilservilo"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "importi/kunfandi �losilojn"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "aktualigi la fido-datenaron"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
#, fuzzy
msgid "print message digests"
msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "krei eligon en askia kiraso"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOMO|�ifri por NOMO"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|difini densig-nivelon N (0=nenia)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "uzi tekstan re�imon"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "fari neniajn �an�ojn"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr ""
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2609,7 -2019,6 +2588,7 @@@ msgstr "
"@\n"
"(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2629,13 -2038,11 +2608,13 @@@ msgstr "
" --list-keys [nomoj] montri �losilojn\n"
" --fingerprint [nomoj] montri fingro�purojn\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2650,7 -2057,6 +2629,7 @@@ msgstr "
"subskribi, kontroli, �ifri a� mal�ifri\n"
"implicita operacio dependas de la enigataj datenoj\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2658,612 -2064,478 +2637,607 @@@ msgstr "
"\n"
"Realigitaj metodoj:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr ""
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr ""
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr ""
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
#, fuzzy
msgid "Compression: "
msgstr "Komento: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uzado: gpg [opcioj] "
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "malkongruaj komandoj\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr ""
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "%s: nova opcio-dosiero kreita\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "montri, en kiu �losilaro estas listigita �losilo"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "mal�alti �losilon"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "nekonata implicita ricevonto '%s'\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "nekonata implicita ricevonto '%s'\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, fuzzy, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr ""
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "NOTO: %s ne estas por normala uzado!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "Nevalida retadreso\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ne povis analizi URI de �losilservilo\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "nevalida �losilaro"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, fuzzy, c-format
msgid "%s:%d: invalid import options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
#, fuzzy
msgid "invalid import options\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, fuzzy, c-format
msgid "%s:%d: invalid export options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
#, fuzzy
msgid "invalid export options\n"
msgstr "nevalida �losilaro"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
#, fuzzy
msgid "invalid list options\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
#, fuzzy
msgid "invalid verify options\n"
msgstr "nevalida �losilaro"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTO: programo povas krei core-dosieron!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTO: %s nuligas %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ne eblas kun %s!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ne havas sencon kun %s!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
#, fuzzy
msgid "selected certification digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed devas esti pli granda ol 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed devas esti pli granda ol 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
#, fuzzy
msgid "invalid default preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
#, fuzzy
msgid "invalid personal cipher preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
#, fuzzy
msgid "invalid personal digest preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
#, fuzzy
msgid "invalid personal compress preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne havas sencon kun %s!\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, fuzzy, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, fuzzy, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, fuzzy, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [dosiero]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [dosiero]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "mal�ifrado malsukcesis: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [dosiero]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [dosiero]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [dosiero]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [dosiero]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [dosiero]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key uzantidentigilo"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key uzantidentigilo"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key uzantidentigilo [komandoj]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key uzantidentigilo"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
msgid "export as ssh key failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "get_dir_record: search_record malsukcesis: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "elkirasigo malsukcesis: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[dosiero]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Ektajpu vian mesa�on ...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "la donita gvidlinia URL por atestado ne validas\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@@ -3307,328 -2571,262 +3281,328 @@@ msgstr "Nenia helpo disponata
msgid "No help available for '%s'"
msgstr "Nenia helpo disponata por '%s'"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "aktualigi la fido-datenaron"
- #: g10/import.c:143
++#: g10/import.c:147
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "aktualigi la fido-datenaron"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
msgid "show key during import"
msgstr "montri fingrospuron"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:152
++#: g10/import.c:156
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "neuzebla sekreta �losilo"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "ignoras blokon de speco %d\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu �losiloj jam traktitaj\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Nombro traktita entute: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " ignoritaj novaj �losiloj: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ignoritaj novaj �losiloj: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sen uzantidentigilo: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importitaj: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " ne�an�itaj: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novaj uzantidentigiloj: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novaj sub�losiloj: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " novaj subskriboj: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novaj �losilrevokoj: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " sekretaj �losiloj legitaj: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "sekretaj �losiloj importitaj: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, fuzzy, c-format
msgid " not imported: %lu\n"
msgstr " importitaj: %lu"
- #: g10/import.c:639
++#: g10/import.c:645
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " novaj subskriboj: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " sekretaj �losiloj legitaj: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1042
++#: g10/import.c:1048
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s-subskribo de: %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "�losilo %08lX: mankas uzantidentigilo\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "ignoris '%s': %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1264
++#: g10/import.c:1343
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "�losilo %08lX: nova �losilo - ignorita\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "neniu skribebla �losilaro trovita: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "eraro dum skribado de �losilaro '%s': %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "�losilo %08lX: publika �losilo importita\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "�losilo %08lX: diferencas de nia kopio\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "�losilo %08lX: ne povas trovi originalan �losilblokon: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "�losilo %08lX: ne povas legi originalan �losilblokon: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "�losilo %08lX: 1 nova subskribo\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "�losilo %08lX: %d novaj subskriboj\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "�losilo %08lX: 1 nova sub�losilo\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "�losilo %08lX: %d novaj subskriboj\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "�losilo %08lX: %d novaj subskriboj\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "�losilo %08lX: ne �an�ita\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "�losilo %08lX: sekreta �losilo importita\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "ignorita: sekreta �losilo jam �eestas\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "�losilo '%s' ne trovita: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
@@@ -3643,138 -2841,111 +3617,138 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"�losilo %08lX: publika �losilo mankas - ne povas apliki revokatestilon\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "�losilo %08lX: revokatestilo importita\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "�losilo %08lX: nevalida mem-subskribo\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "�losilo %08lX: ignoris uzantidentigilon '"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "�losilo %08lX: ignoris sub�losilon\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "�losilo %08lX: revokatestilo aldonita\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
@@@ -4149,8 -3258,6 +4123,8 @@@ msgstr "
msgid "Really sign? (y/N) "
msgstr "�u vere subskribi? "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
@@@ -4634,14 -3639,10 +4608,14 @@@ msgid "
"unless you restart the program.\n"
msgstr ""
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
#, fuzzy
msgid "revoked"
msgstr "rev"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "eksval"
@@@ -5604,19 -4427,16 +5578,19 @@@ msgstr " �losilo-fingrospuro =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "kontrolas �losilaron '%s'\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
msgstr[1] "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, fuzzy, c-format
#| msgid "\t%lu keys updated\n"
msgid "%lu key cached"
@@@ -5624,7 -4444,6 +5598,7 @@@ msgid_plural "%lu keys cached
msgstr[0] "\t%lu �losiloj aktualigitaj\n"
msgstr[1] "\t%lu �losiloj aktualigitaj\n"
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5632,7 -4451,6 +5606,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 malbona subskribo\n"
msgstr[1] "1 malbona subskribo\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: �losilaro kreita\n"
@@@ -5854,119 -4627,99 +5828,124 @@@ msgstr "memstara revoko - uzu \"gpg --i
msgid "no signature found\n"
msgstr "Bona subskribo de \""
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "MALBONA subskribo de \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Eksvalidi�inta subskribo de \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Bona subskribo de \""
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "kontrolo de subskribo estas mal�altita\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alinome \""
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ msgid " issuer \"%s\"\n"
+ msgstr " alinome \""
+
++#: g10/mainproc.c:1772
#, fuzzy
msgid "Key available at: "
msgstr "Nenia helpo disponata"
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[malcerta]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alinome \""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, fuzzy, c-format
msgid "Signature expired %s\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, fuzzy, c-format
msgid "Signature expires %s\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, fuzzy, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s-subskribo de: %s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
#, fuzzy
msgid "binary"
msgstr "�efa"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr ""
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
#, fuzzy
msgid "unknown"
msgstr "nekonata versio"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "nekonata publik�losila metodo"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Ne povas kontroli subskribon: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "ne aparta subskribo\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "memstara subskribo de klaso 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "malnovstila subskribo (PGP 2.x)\n"
@@@ -6144,88 -4862,44 +6123,55 @@@ msgstr "
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "problemo kun agento: agento redonas 0x%lx\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, fuzzy, c-format
- msgid " (main key ID %s)"
- msgstr " (�ef�losilo %08lX)"
-
- #: g10/passphrase.c:277
- #, fuzzy, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Vi bezonas pasfrazon por mal�losi la sekretan �losilon por la uzanto:\n"
- "\"%.*s\"\n"
- "%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Donu pasfrazon\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "nuligita de uzanto\n"
- #: g10/passphrase.c:483
- #, fuzzy, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "\n"
- "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
- "por la uzanto: \""
-
- #: g10/passphrase.c:491
++#: g10/passphrase.c:489
#, fuzzy, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr ""
+ msgid " (main key ID %s)"
+ msgstr " (�ef�losilo %08lX)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6428,127 -5067,100 +6374,127 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "�u tamen uzi �i tiun �losilon? "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "AVERTO: Uzas nefidatan �losilon!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
#, fuzzy
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
#, fuzzy
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Tio povas signifi, ke la subskribo estas falsa.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "AVERTO: �i tiu sub�losilo estas revokita de sia posedanto!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Noto: �i tiu �losilo estas mal�altita.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Noto: �i tiu �losilo eksvalidi�is!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "AVERTO: �i tiu �losilo ne estas atestita kun fidata subskribo!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Estas nenia indiko, ke la subskribo apartenas al la posedanto.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVERTO: Ni NE fidas �i tiun �losilon!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " La subskribo ver�ajne estas FALSA.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"AVERTO: �i tiu �losilo ne estas atestita kun sufi�e fidataj subskriboj!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
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:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ignorita: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ignorita: publika �losilo jam �eestas\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/pkclist.c:991
++#: g10/pkclist.c:995
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/pkclist.c:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6556,37 -5168,29 +6502,37 @@@ msgstr "
"\n"
"Donu la uzantidentigilon. Finu per malplena linio: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Uzantidentigilo ne ekzistas.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
msgid "skipped: public key already set as default recipient\n"
msgstr "ignorita: publika �losilo jam difinita kiel implicita ricevonto\n"
- #: g10/pkclist.c:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "Publika �losilo estas mal�altita.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "ignorita: publika �losilo jam agordita\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "nekonata implicita ricevonto '%s'\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "mankas validaj adresitoj\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "�losilo %08lX: mankas uzantidentigilo\n"
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "�losilo %08lX: mankas uzantidentigilo\n"
@@@ -6860,7 -5412,6 +6806,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
msgstr[1] "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6934,22 -5476,18 +6880,22 @@@ msgstr "
"AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
"kompletigo.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s-subskribo de: %s\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "subskribas:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s �ifrado estos aplikata\n"
@@@ -7056,7 -5574,6 +7002,7 @@@ msgstr "fido-datenaro-transakcio tro gr
msgid "%s: directory does not exist!\n"
msgstr "%s: dosierujo ne ekzistas!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "ne povas fermi '%s': %s\n"
@@@ -7167,150 -5662,117 +7113,142 @@@ msgstr "ne povas trakti tekstliniojn pl
msgid "input line longer than %d characters\n"
msgstr "enigata linio pli longa ol %d signojn\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Realigitaj metodoj:\n"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Gvidlinio: "
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "listigi �losilojn"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|metodo [dosieroj]|presi mesa�o-kompendiojn"
msgstr[1] "|metodo [dosieroj]|presi mesa�o-kompendiojn"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7320,93 -5782,78 +7258,93 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
msgid "Verified %ld messages signed by \"%s\"."
msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7417,20 -5864,16 +7355,20 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7447,8 -5890,6 +7385,7 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
@@@ -7986,7 -6318,6 +7923,7 @@@ msgstr "Donu la uzantidentigilon:
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8042,16 -6362,13 +7979,16 @@@ msgid "
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8156,12 -6450,10 +8093,12 @@@ msgstr "
msgid "checking the CRL failed: %s"
msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, fuzzy, c-format
msgid "certificate with invalid validity: %s"
msgstr "problemo �e legado de atestilo: %s\n"
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
#, fuzzy
msgid "certificate not yet valid"
msgstr "Valida atestilrevoko"
@@@ -8176,7 -6466,6 +8113,7 @@@ msgstr "Valida atestilrevoko
msgid "intermediate certificate not yet valid"
msgstr "Valida atestilrevoko"
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
#, fuzzy
msgid "certificate has expired"
msgstr "problemo �e legado de atestilo: %s\n"
@@@ -8232,7 -6510,6 +8169,7 @@@ msgstr "Valida atestilrevoko
msgid " ( issuer valid from "
msgstr ""
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "Fingrospuro:"
@@@ -8265,7 -6536,6 +8202,7 @@@ msgstr "Bona atestilo
msgid "self-signed certificate has a BAD signature"
msgstr ""
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
#, fuzzy
msgid "root certificate is not marked trusted"
msgstr ""
@@@ -8277,31 -6546,25 +8214,31 @@@
msgid "checking the trust list failed: %s\n"
msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
#, fuzzy
msgid "certificate chain too long\n"
msgstr "Valida atestilrevoko"
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
#, fuzzy
msgid "issuer certificate not found"
msgstr "Valida atestilrevoko"
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "kontroli subskribon"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr ""
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
#, fuzzy
msgid "certificate is good\n"
msgstr "Valida atestilrevoko"
@@@ -8336,7 -6593,6 +8273,7 @@@ msgstr "
msgid "(this is the MD2 algorithm)\n"
msgstr ""
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
#, fuzzy
msgid "none"
msgstr "ne"
@@@ -8372,36 -6623,28 +8309,36 @@@ msgstr "
"\"%.*s\"\n"
"%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr ""
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr ""
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr ""
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr ""
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr ""
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr ""
@@@ -8842,22 -6995,18 +8779,22 @@@ msgstr "
msgid "%s:%u: skipping this line\n"
msgstr " s = supersalti �i tiun �losilon\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "ne povis analizi URI de �losilservilo\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "skribas al '%s'\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "ne povas fermi '%s': %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8920,7 -7057,6 +8857,7 @@@ msgstr "rev? problemo en kontrolo de re
msgid "error storing flags: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr ""
@@@ -9037,97 -7152,73 +8974,92 @@@ msgstr "
msgid "dropping %u certificates from the cache\n"
msgstr ""
- #: dirmngr/certcache.c:352
- #, fuzzy, c-format
- msgid "can't access directory '%s': %s\n"
- msgstr "%s: ne povas krei dosierujon: %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't parse certificate '%s': %s\n"
msgstr "ne povas krei '%s': %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, fuzzy, c-format
msgid "certificate '%s' already cached\n"
msgstr "ripetita atestilo - forvi�ita"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, fuzzy, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "ripetita atestilo - forvi�ita"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, fuzzy, c-format
msgid "certificate '%s' loaded\n"
msgstr "ripetita atestilo - forvi�ita"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, fuzzy, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr "Fingrospuro:"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, fuzzy, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, fuzzy, c-format
msgid "permanently loaded certificates: %u\n"
msgstr "Nevalida atestilo"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, fuzzy, c-format
msgid " runtime cached certificates: %u\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
#, fuzzy
msgid "certificate already cached\n"
msgstr "�losilo %08lX: revokatestilo aldonita\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
#, fuzzy
msgid "certificate cached\n"
msgstr "Valida atestilrevoko"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, fuzzy, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, fuzzy, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, fuzzy, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
#, fuzzy
msgid "no issuer found in certificate\n"
msgstr "Bona atestilo"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, fuzzy, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
@@@ -9386,7 -7426,6 +9318,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
@@@ -9407,7 -7443,6 +9339,7 @@@ msgstr "
msgid "converting S-expression failed: %s\n"
msgstr "�an�o de permesoj de '%s' malsukcesis: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, fuzzy, c-format
#| msgid "changing permission of `%s' failed: %s\n"
msgid "creating S-expression failed: %s\n"
@@@ -9804,116 -7759,85 +9736,112 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr ""
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
#, fuzzy
msgid "run without asking a user"
msgstr "�u fini sen skribi �an�ojn? "
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "ne povis analizi URI de �losilservilo\n"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9926,91 -7850,72 +9854,91 @@@ msgstr "
"@\n"
"(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uzado: gpg [opcioj] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
#, 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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "pasfrazo estas tro longa\n"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "kiraso: %s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
#, fuzzy
msgid "shutdown forced\n"
msgstr "ne traktita"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10353,102 -8188,81 +10281,102 @@@ msgstr "�an�o de permesoj de '%s' malsu
msgid "not signed by a default OCSP signer's certificate"
msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, fuzzy, c-format
msgid "allocating list item failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, fuzzy, c-format
msgid "error getting responder ID: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr ""
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, fuzzy, c-format
msgid "issuer certificate not found: %s\n"
msgstr "Valida atestilrevoko"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr ""
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
#, fuzzy
msgid "caller did not return the issuing certificate\n"
msgstr "Bona atestilo"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, fuzzy, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, fuzzy, c-format
#| msgid "%s: can't access: %s\n"
msgid "can't get authorityInfoAccess: %s\n"
msgstr "%s: ne povas aliri: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
#, fuzzy
#| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
msgstr "mankas implicita sekreta �losilaro: %s\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr ""
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, fuzzy, c-format
msgid "using OCSP responder '%s'\n"
msgstr "subskribado malsukcesis: %s\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, fuzzy, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, fuzzy, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "�losilo %08lX: �losilo estas revokita!\n"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr ""
@@@ -10496,33 -8300,27 +10424,33 @@@ msgstr "forvi�o de �losilbloko malsukce
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "ne povas krei '%s': %s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: malsukcesis krei haktabelon: %s\n"
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, 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:2444
++#: dirmngr/server.c:2406
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
- #: dirmngr/server.c:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10547,34 -8341,24 +10475,30 @@@ msgstr "
msgid "checking CRL for"
msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
#, fuzzy
msgid "selfsigned certificate has a BAD signature"
msgstr "kontroli subskribon"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, fuzzy, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
#, fuzzy
msgid "certificate chain is good\n"
msgstr "Valida atestilrevoko"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr ""
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "fini"
@@@ -10702,11 -8455,9 +10626,11 @@@ msgstr "
msgid "Options enforcing a passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
@@@ -10846,85 -8565,66 +10770,85 @@@ msgstr "
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
#, fuzzy
msgid "list global configuration file"
msgstr "%s: nova opcio-dosiero kreita\n"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
#, fuzzy
msgid "check global configuration file"
msgstr "%s: nova opcio-dosiero kreita\n"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "uzi dosieron por eligo"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
#, fuzzy
msgid "Component not found"
msgstr "publika �losilo ne trovita"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
#, fuzzy
msgid "No argument allowed"
msgstr "skribas sekretan �losilon al '%s'\n"
@@@ -10978,122 -8669,97 +10902,122 @@@ msgid "
"Call a simple symmetric encryption tool\n"
msgstr ""
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s ne eblas kun %s!\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, fuzzy, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "ne povas malfermi %s: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "eraro dum skribado de �losilaro '%s': %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
msgid "no --program option provided\n"
msgstr ""
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr ""
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr ""
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "ne povas krei %s: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "ne povas krei %s: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, fuzzy, c-format
msgid "could not fork: %s\n"
msgstr "%s: uzanto ne trovita: %s\n"
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "ne povas krei '%s': %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "ne povas krei '%s': %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr ""
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "protekto-metodo %d%s ne estas realigita\n"
diff --cc po/es.po
index 20b986c,157e529..3fd94ac
--- a/po/es.po
+++ b/po/es.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 2.0.9\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2015-10-09 17:10+0200\n"
"Last-Translator: Jaime Su�rez <jaime.suma at gmail.com>\n"
"Language-Team: Spanish <es at li.org>\n"
@@@ -120,13 -104,9 +120,13 @@@ msgstr "
# �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
# �Es que son m�s listos? :-)
#
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
msgid "Passphrase:"
msgstr "Frase contrase�a:"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr "no coincide - reint�ntelo"
@@@ -175,46 -147,28 +175,46 @@@ msgstr "PIN incorrecto
msgid "Bad Passphrase"
msgstr "Frase contrase�a err�nea"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "no pueden usarse claves ssh de m�s de %d bits\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, 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:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
msgstr "no se puede abrir `%s': %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "error obteniendo el n�mero de serie de la tarjeta: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "detectada tarjeta con S/N: %s\n"
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, fuzzy, c-format
#| msgid "error getting default authentication keyID of card: %s\n"
msgid "no authentication key for ssh on card: %s\n"
@@@ -222,47 -176,38 +222,47 @@@ msgstr "
"error obteniendo ID de la clave por defecto para autenticaren la tarjeta: "
"%s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "no se encuentra una clave de tarjeta adecuada: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, c-format
msgid "shadowing the key failed: %s\n"
msgstr "el sombreado de la clave fall�: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, c-format
msgid "error writing key: %s\n"
msgstr "error escribiendo clave: %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, fuzzy, c-format
#| msgid "Please enter the passphrase for the ssh key%0A %c"
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Por favor introduzca la frase contrase�a para la clave ssh%0A %c"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Por favor vuelva a introducir frase contrase�a"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, fuzzy, c-format
#| msgid ""
#| "Please enter a passphrase to protect the received secret key%%0A %s"
@@@ -274,7 -219,6 +274,7 @@@ msgstr "
"Por favor introduzca una frase contrase�a para proteger la clave "
"secretarecibida%%0A %s%%0Aen el almacen de claves del agente gpg"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "fallo al crear un flujo desde el socket: %s\n"
@@@ -434,8 -352,6 +434,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:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -443,117 -359,86 +443,117 @@@ msgstr "
"@Opciones:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr "ejecutar en modo demonio (segundo plano)"
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr "ejecutar en modo servidor (primer plano)"
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "prolijo"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "algo m�s discreto"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr "salida de datos estilo sh"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr "salida de datos estilo csh"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FICHERO|lee opciones desde FICHERO"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr "no independizarse de la consola"
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr "no acaparar teclado y rat�n"
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "usar un fichero log para el servidor"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|usar PGM como el programa para entrada de PIN"
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|usar PCM como programa SCdaemon"
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
msgid "do not use the SCdaemon"
msgstr "no usar SCdaemon"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, 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:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr "ignorar peticiones de cambiar el TTY"
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr "ignorar peticiones de cambiar el display X"
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|los PINs en la cach� expiran en N segundos"
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr "no usar el cach� de PINs al firmar"
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, 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:220
++#: agent/gpg-agent.c:219
#, 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:223
++#: agent/gpg-agent.c:222
msgid "allow presetting passphrase"
msgstr "permitir preestablecer frase contrase�a"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
#, fuzzy
#| msgid "enable ssh-agent emulation"
msgid "enable ssh support"
msgstr "permitir emulaci�n de ssh-agent"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -562,21 -447,14 +562,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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Por favor, informe de posibles \"bugs\" a <@EMAIL@>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
#, 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:484
++#: agent/gpg-agent.c:483
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -588,120 -466,85 +588,112 @@@ msgstr "
"Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
"Manejo de claves privadas por GnuPG\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, 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:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "fichero de opciones `%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, 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:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, c-format
msgid "can't create socket: %s\n"
msgstr "no se puede crear el socket: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, 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:1844
++#: agent/gpg-agent.c:1843
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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
msgid "error getting nonce for the socket\n"
msgstr "error obteniendo valor �nico para el socket\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, 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:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, 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:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() fall�: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, 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:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, 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:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
msgstr "directorio `%s' creado\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, 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:1958
++#: agent/gpg-agent.c:1957
#, 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:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "error leyendo valor �nico en el descriptor %d: %s\n"
@@@ -716,30 -557,24 +708,30 @@@ msgstr "manejador 0x%lx para descripto
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, 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:2390
++#: agent/gpg-agent.c:2392
#, 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:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, 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:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s detenido\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "no hay un agente gpg ejecut�ndose en esta sesi�n\n"
@@@ -759,8 -592,6 +751,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:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -768,9 -599,6 +760,9 @@@ msgstr "
"@�rdenes:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -792,22 -618,18 +784,22 @@@ msgstr "
"Sintaxis: gpg-protect-tool [opciones] [args]\n"
"Herramienta para el mantenimiento de claves secretas\n"
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Introduzca frase contrase�a para desproteger el objeto PKCS#12."
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Introduzca frase contrase�a para proteger el nuevo objeto PKCS#12."
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
"Introduzca la frase contrase�a para proteger el objeto importado en GnuPG"
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -815,16 -637,13 +807,16 @@@ msgstr "
"Por favor introduzca la frase contrase�a o PIN\n"
"necesarios para completar esta operaci�n."
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
msgid "cancelled\n"
msgstr "cancelado\n"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -1009,46 -799,34 +1001,46 @@@ msgstr "el algoritmo de protecci�n %d%
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "el algoritmo de protecci�n %d%s no puede ser utilizado\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "error creando tuber�a: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error creating a stream for a pipe: %s\n"
msgstr "error creando tuber�a: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, c-format
msgid "error forking process: %s\n"
msgstr "error bifurcando procesos: %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
#| msgid "waiting for process %d to terminate failed: %s\n"
msgid "waiting for processes to terminate failed: %s\n"
msgstr "fallo esperando que el proceso %d terminara: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, fuzzy, c-format
#| msgid "error running `%s': probably not installed\n"
msgid "error running '%s': probably not installed\n"
msgstr "error ejecutando `%s': probablemente no est� instalado\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
#| msgid "error running `%s': exit status %d\n"
msgid "error running '%s': exit status %d\n"
msgstr "error ejecutando `%s': c�digo de finalizaci�n %d\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, fuzzy, c-format
#| msgid "error running `%s': terminated\n"
msgid "error running '%s': terminated\n"
@@@ -1064,35 -840,14 +1056,17 @@@ msgstr "error obteniendo c�digo de fina
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "fallo esperando que el proceso %d terminara: %s\n"
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "no se puede conectar con `%s': %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "problema de comunicaci�n con el agente gpg\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
msgid "problem setting the gpg-agent options\n"
msgstr "problema estableciendo opciones de gpg-agent\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- msgid "canceled by user\n"
- msgstr "cancelado por el usuario\n"
-
- #: common/simple-pwquery.c:579
- msgid "problem with the agent\n"
- msgstr "problema con el agente\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- #| msgid "problem with the agent: %s\n"
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "problema con el agente: %s\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "no se pueden desactivar los volcados de core: %s\n"
@@@ -1178,7 -916,6 +1152,7 @@@ msgstr "%s:%u: opci�n obsoleta \"%s\"
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "ATENCI�N: \"%s\" es una opci�n obsoleta - no tiene efecto\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1205,19 -938,16 +1179,19 @@@ msgstr "
msgid "connection to agent is in restricted mode\n"
msgstr "no puedo conectar con el dirmngr - intentando retirada\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, fuzzy, c-format
#| msgid "no running dirmngr - starting `%s'\n"
msgid "no running Dirmngr - starting '%s'\n"
msgstr "no hay dirmngr en ejecuci�n - iniciando `%s'\n"
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, fuzzy, c-format
#| msgid "waiting %d seconds for the agent to come up\n"
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "esperando %d segundos para que el agente arranque\n"
- #: common/asshelp.c:672
++#: common/asshelp.c:639
#, fuzzy
#| msgid "can't connect to the dirmngr - trying fall back\n"
msgid "connection to the dirmngr established\n"
@@@ -1481,7 -1151,6 +1455,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:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
msgid "out of core\n"
msgstr "memoria desbordada\n"
@@@ -1544,7 -1202,10 +1518,13 @@@ msgstr "bloqueo `%s' no hecho: %s\n
msgid "waiting for lock %s...\n"
msgstr "esperando al bloqueo %s...\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "armadura: %s\n"
@@@ -1784,10 -1390,6 +1764,10 @@@ msgstr "URL de donde recuperar la clav
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Error: URL demasiado larga (el m�ximo son %d caracteres).\n"
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
@@@ -2088,27 -1625,18 +2068,27 @@@ msgstr "No se permiten �rdenes de admin
msgid "Invalid command (try \"help\")\n"
msgstr "Orden inv�lida (pruebe \"help\")\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output no funciona con esta orden\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "no se puede abrir `%s'\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "clave \"%s\" no encontrada: %s\n"
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "error leyendo bloque de claves: %s\n"
@@@ -2169,39 -1685,32 +2149,39 @@@ msgstr "�hay una clave secreta para est
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "use antes la opci�n \"--delete-secret-key\" para borrarla.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "error creando frase contrase�a: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "no puede usar un paquete sim�trico ESK debido al modo S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "usando cifrado %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' ya est� comprimido\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "ATENCI�N `%s' es un fichero vac�o\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "leyendo desde `%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2209,7 -1718,6 +2189,7 @@@ msgstr "
"AVISO: forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
"del destinatario\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2218,19 -1726,16 +2198,19 @@@ msgstr "
"AVISO: forzar el algoritmo de compresi�n %s (%d) va en contra\n"
"de las preferencias del receptor\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
"del destinatario\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "no puede usar %s en modo %s\n"
@@@ -2340,8 -1824,6 +2320,8 @@@ msgstr "borrar tanto como sea posible d
msgid " - skipped"
msgstr "%s: omitido: %s\n"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2376,8 -1851,6 +2356,8 @@@ msgstr "error creando `%s': %s\n
msgid "[User ID not found]"
msgstr "[ID de usuario no encontrado]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
@@@ -2449,205 -1909,157 +2429,205 @@@ msgstr "Clave %s inv�lida hecha v�lida
msgid "using subkey %s instead of primary key %s\n"
msgstr "usando subclave %s en vez de clave primaria %s\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
msgid "make a signature"
msgstr "crea una firma"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
msgid "make a clear text signature"
msgstr "crea una firma en texto claro"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "crea una firma separada"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "cifra datos"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "cifra s�lo con un cifrado sim�trico"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "descifra datos (predefinido)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verifica una firma"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "lista claves"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "lista claves y firmas"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "list and check key signatures"
msgstr "lista y comprueba firmas de las claves"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "lista claves y huellas dactilares"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "lista claves secretas"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "genera un nuevo par de claves"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genera un nuevo par de claves"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genera un nuevo par de claves"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "genera un nuevo par de claves"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "genera un certificado de revocaci�n"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "elimina claves del anillo p�blico"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "elimina claves del anillo privado"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "firma la clave"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "firma la clave localmente"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "firma la clave"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "firma la clave localmente"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "firma o modifica una clave"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "cambia una frase contrase�a"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "exporta claves"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "exporta claves a un servidor de claves"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "importa claves desde un servidor de claves"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "busca claves en un servidor de claves"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "actualiza todas las claves desde un servidor de claves"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "importa/fusiona claves"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr "escribir estado de la tarjeta"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr "cambiar datos en la tarjeta"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr "cambiar el PIN de la tarjeta"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "actualiza la base de datos de confianza"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
msgid "print message digests"
msgstr "imprime res�menes de mensaje"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "ejecutar en modo servidor"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "crea una salida ascii con armadura"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ID-USUARIO|cifra para ID-USUARIO"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|ID-USUARIO|usa este identificador para firmar o descifrar"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|nivel de compresi�n N (0 desactiva)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "usa modo de texto can�nico"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FICHERO|volcar salida en FICHERO"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "no hace ning�n cambio"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "preguntar antes de sobreescribir"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr "usar estilo OpenPGP estricto"
@@@ -2655,7 -2067,6 +2635,7 @@@
# p�gina man -> p�gina de manual
# Vale. �del manual mejor?
# Hmm, no s�, en man-db se usa "de". La verdad es que no lo he pensado.
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2663,7 -2074,6 +2643,7 @@@ msgstr "
"@\n"
"(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2683,13 -2093,11 +2663,13 @@@ msgstr "
" --list-keys [nombres] muestra las claves\n"
" --fingerprint [nombres] muestra las huellas dactilares\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2704,7 -2112,6 +2684,7 @@@ msgstr "
"firma, comprueba, cifra o descifra\n"
"la operaci�n por defecto depende de los datos de entrada\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2712,81 -2119,66 +2692,81 @@@ msgstr "
"\n"
"Algoritmos disponibles:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "Clave p�blica: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Cifrado: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Resumen: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Compresi�n: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "uso: gpgsm [opciones] "
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "�rdenes incompatibles\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, fuzzy, c-format
#| msgid "no = sign found in group definition `%s'\n"
msgid "no = sign found in group definition '%s'\n"
msgstr "no se encontr� el signo = en la definici�n de grupo `%s'\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "AVISO: propiedad insegura del fichero de configuraci�n `%s'\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on extension `%s'\n"
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "AVISO: permisos inseguros del fichero de configuraci�n `%s'\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on extension `%s'\n"
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "AVISO: propiedad insegura del directorio contenedor de `%s'\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2796,20 -2188,17 +2776,20 @@@ msgstr "
"AVISO: propiedad insegura del directorio contenedor del fichero de\n"
"configuraci�n `%s'\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"AVISO: propiedad insegura del directorio contenedor de la extensi�n `%s'\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "AVISO: permisos inseguros del directorio contenedor de `%s'\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2820,500 -2209,388 +2800,495 @@@ msgstr "
"AVISO: permisos inseguros del directorio contenedor del fichero de\n"
"configuraci�n `%s'\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"AVISO: permisos inseguros del directorio contenedor de la extensi�n `%s'\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "art�culo de configuraci�n desconocido `%s'\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr "mostrar foto IDs al listar claves"
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
#, fuzzy
#| msgid "show user ID validity during key listings"
msgid "show key usage information during key listings"
msgstr "mostrar validez de la ID de usuario al listar claves"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr "mostrar URLS de pol�tica al listar firmas"
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
msgid "show all notations during signature listings"
msgstr "mostrar todas las notaciones al listar firmas"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr "mostrar notaciones est�ndar IETF al listar firmas"
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr "mostrar notaciones personalizadas al listar firmas"
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
msgid "show preferred keyserver URLs during signature listings"
msgstr "mostrar URL del servidor de claves preferido al listar firmas"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr "mostrar validez de la ID de usuario al listar claves"
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr "mostrar subclaves revocadas y expiradas al listar claves"
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
msgid "show the keyring name in key listings"
msgstr "mostrar nombre de los anillos de claves al listar claves"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
msgid "show expiration dates during signature listings"
msgstr "mostrar fechas de caducidad al listar firmas"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "Claves disponibles:\n"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "opci�n desconocida `%s'\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- #| msgid "unknown command `%s'\n"
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "orden desconocida `%s'\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, fuzzy, c-format
#| msgid "NOTE: old default options file `%s' ignored\n"
msgid "Note: old default options file '%s' ignored\n"
msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr "libgcrypt demasiado antigua (necesito %s, tengo %s)\n"
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "NOTA: �%s no es para uso normal!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, fuzzy, c-format
#| msgid "`%s' is not a valid signature expiration\n"
msgid "'%s' is not a valid signature expiration\n"
msgstr "`%s' no es una fecha de caducidad v�lida\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ #| msgid "line %d: not a valid email address\n"
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "l�nea %d: no es una direcci�n de email v�lida\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, fuzzy, c-format
#| msgid "invalid country code in `%s', line %d\n"
msgid "invalid pinentry mode '%s'\n"
msgstr "c�digo de pa�s inv�lido en `%s', l�nea %d\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, fuzzy, c-format
#| msgid "`%s' is not a valid character set\n"
msgid "'%s' is not a valid character set\n"
msgstr "`%s' no es un juego de caracteres v�lido\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "no se puede interpretar la URL del servidor de claves\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
msgid "invalid keyserver options\n"
msgstr "opciones del servidor de claves inv�lidas\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "opciones de importaci�n inv�lidas\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "lista de opciones inv�lida\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "opciones de exportaci�n inv�lidas\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: lista de opciones inv�lida\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
msgid "invalid list options\n"
msgstr "lista de opciones inv�lida\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr "mostrar foto IDs al verificar firmas"
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr "mostrar URLs de pol�tica al verificar firmas"
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
msgid "show all notations during signature verification"
msgstr "mostrar todas las notaciones al verificar firmas"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr "mostrar notaciones est�ndar IETF al verificar firmas"
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr "mostrar notaciones personalizadas al verificar firmas"
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
msgid "show preferred keyserver URLs during signature verification"
msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
msgid "show user ID validity during signature verification"
msgstr "mostrar validez del ID de usuario al verificar firmas"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
msgid "show only the primary user ID in signature verification"
msgstr "mostrar solo ID primario de usuario al verificar firmas"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr "validar firmas con datos PKA"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr "aumentar confianza en las firmas con datos v�lidos PKA"
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
msgid "invalid verify options\n"
msgstr "opciones de verificaci�n inv�lidas\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "imposible establecer camino de ejecutables %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: lista de auto-localizaci�n de claves inv�lida\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr "lista de auto-localizaci�n de claves inv�lida\n"
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sustituye a %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�%s no permitido con %s!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�%s no tiene sentido con %s!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr "AVISO: ejecut�ndose con hora del sistema falsificada"
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "no se ejecutar� en memoria insegura por %s\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
msgid "selected compression algorithm is invalid\n"
msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser mayor que 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser mayor que 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth debe estar en el rango de 1 a 255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "preferencias por defecto inv�lidas\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "preferencias personales de cifrado inv�lidas\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "preferencias personales de compresi�n inv�lidas\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s a�n no funciona con %s\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, fuzzy, c-format
#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "no puede usar el cifrado `%s' en modo %s\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, fuzzy, c-format
#| msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "no puede usar el resumen `%s' en modo %s\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, fuzzy, c-format
#| msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "no puede usar la compresi�n `%s' en modo %s\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [nombre_fichero]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [nombre_fichero]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, fuzzy, c-format
#| msgid "symmetric encryption of `%s' failed: %s\n"
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [nombre_fichero]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [nombre_fichero]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "no puede usar --symetric --encrypt con --s2k-mode 0\n"
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "no puede usar --symetric --encrypt en modo %s\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [nombre_fichero]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nombre_fichero]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [nombre_fichero]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "no puede usar --symetric --sign --encrypt con --s2k-mode 0\n"
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nombre_fichero]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [nombre_fichero]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [nombre_fichero]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key id-usuario"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key id-usuario"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-usuario [�rdenes]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
msgid "--passwd <user-id>"
msgstr "--passwd <id-usuario>"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "env�o al servidor de claves fallido: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recepci�n del servidor de claves fallida: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "exportaci�n de clave fallida: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "exportaci�n de clave fallida: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "b�squeda del servidor de claves fallida: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "renovaci�n al servidor de claves fallida: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminaci�n de armadura fallida: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creaci�n de armadura fallida: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error parsing key specification '%s': %s\n"
msgstr "error almacenando certificado: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[nombre_fichero]"
@@@ -3321,19 -2598,15 +3296,19 @@@
# En espa�ol no se deja espacio antes de los puntos suspensivos
# (Real Academia dixit) :)
# Tomo nota :-). Este comentario d�jalo siempre.
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Adelante, teclee su mensaje...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "URL de pol�tica de certificado inv�lida\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "URL de pol�tica inv�lida\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL del servidor de claves preferido no es v�lida\n"
@@@ -3375,138 -2640,110 +3350,138 @@@ msgstr "Ayuda no disponible
msgid "No help available for '%s'"
msgstr "No hay ayuda disponible para `%s'"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr "importar firmas marcadas como s�lo locales"
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr "reparar da�o del servidor de claves p�blicas al importar"
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "no actualiza la base de datos de confianza despu�s de importar"
- #: g10/import.c:143
++#: g10/import.c:147
msgid "do not update the trustdb after import"
msgstr "no actualiza la base de datos de confianza despu�s de importar"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "muestra huella dactilar de la clave"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr "s�lo aceptar actualizaciones de claves ya existentes"
- #: g10/import.c:152
++#: g10/import.c:156
msgid "remove unusable parts from key after import"
msgstr "borrar partes in�tiles de la clave despu�s de importar"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr "borrar tanto como sea posible de la clave tras importar"
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "omitiendo bloque de tipo %d\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu claves procesadas hasta ahora\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Cantidad total procesada: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " omitidas nuevas claves: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " omitidas nuevas claves: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sin identificador: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importadas: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " sin cambios: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nuevos identificativos: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nuevas subclaves: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " nuevas firmas: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nuevas revocaciones de claves: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " claves secretas le�das: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " claves secretas importadas: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "claves secretas sin cambios: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " no importadas: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " firmas limpiadas: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " IDs de usuario limpiados: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3515,195 -2752,157 +3490,195 @@@ msgstr "
"AVISO: la clave %s contiene preferencias para algoritmos\n"
"no disponibles en estos IDs de usuario:\n"
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": algoritmo de cifrado preferido %s\n"
- #: g10/import.c:1042
++#: g10/import.c:1048
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": algoritmo de resumen preferido %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": algoritmo de compresi�n preferido %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "se recomienda encarecidamente que actualice sus preferencias y\n"
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"re-dustribuya esta clave para evitar potenciales problemas de\n"
"diferencias en los algoritmos.\n"
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, c-format
msgid "key %s: no user ID\n"
msgstr "clave %s: sin identificador de usuario\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "omitido \"%s\": %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1264
++#: g10/import.c:1343
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "clave %s: reparada la subclave PKS corrompida\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "clave %s: aceptado ID de usuario sin autofirma \"%s\"\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "clave %s: sin identificadores de usuario v�lidos\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "esto puede ser debido a la ausencia de autofirma\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "clave %s: clave p�blica no encontrada: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "clave %s: clave nueva - omitida\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "anillo de claves no escribible encontrado: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "error escribiendo anillo `%s': %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "clave %s: clave p�blica \"%s\" importada\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "clave %s: no coincide con nuestra copia\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "clave %s: no puede localizarse el bloque de claves original: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "clave %s: no puede leerse el bloque de claves original: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "clave %s: \"%s\" 1 firma nueva\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "clave %s: \"%s\" %d firmas nuevas\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "clave %s: \"%s\" 1 subclave nueva\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "clave %s: \"%s\" %d identificador de usuario limpiado\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "clave %s: \"%s\" %d identificadores de usuario limpiados\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "clave %s: \"%s\" sin cambios\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, c-format
msgid "key %s: secret key imported\n"
msgstr "clave %s: clave secreta importada\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "omitido: clave secreta ya presente\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "key %s: error sending to agent: %s\n"
msgstr "error enviando orden %s: %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key %s: %s\n"
msgstr "clave secreta \"%s\" no encontrada: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
msgid "importing secret keys not allowed\n"
msgstr "no se permite importar claves secretas\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "clave %s: clave secreta con cifrado inv�lido %d - omitida\n"
@@@ -3718,141 -2917,114 +3693,141 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"clave %s: falta la clave p�blica - imposible emplear el\n"
"certificado de revocaci�n\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "clave %s: certificado de revocaci�n inv�lido: %s - rechazado\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "clave %s: \"%s\" certificado de revocaci�n importado\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "clave %s: no hay identificador de usuario para la firma\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "clave %s: algoritmo de clave p�blica no disponible para ID \"%s\"\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "clave %s: autofirma inv�lida para el id \"%s\"\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "clave %s: algoritmo de clave p�blica no disponible\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "clave %s: firma directa de clave inv�lida\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "clave %s: no hay subclave que unir a la clave\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "clave %s: uni�n de subclave inv�lida\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "clave %s: borrado enlace de subclaves m�ltiples\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "clave %s: no hay subclave para la revocaci�n de clave\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "clave %s: revocaci�n de subclave inv�lida\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "clave %s: borrada revocaci�n de subclave m�ltiple\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clave %s: omitido ID de usuario \"%s\"\n"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "clave %s: subclave omitida\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "clave %s: firma no exportable (clase 0x%02x) - omitida\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "clave %s: certificado de revocaci�n en lugar equivocado - omitido\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "clave %s: certificado de revocaci�n no valido: %s - omitido\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "clave %s: firma de clase (0x%02x) inesperada - omitida\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "clave %s: detectado usuario duplicado - fusionada\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVISO: la clave %s puede estar revocada: recuperando clave de revocaci�n %s\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVISO: la clave %s puede estar revocada: falta clave de revocaci�n %s.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "clave %s: \"%s\" certificado de revocaci�n a�adido\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "clave %s: firma directa de clave a�adida\n"
@@@ -4197,8 -3307,6 +4172,8 @@@ msgstr "He comprobado esta clave meticu
msgid "Really sign? (y/N) "
msgstr "�Firmar de verdad? (s/N) "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallida: %s\n"
@@@ -4666,13 -3672,9 +4641,13 @@@ msgstr "
"Por favor, advierta que la validez de clave mostrada no es necesariamente\n"
"correcta a menos de que reinicie el programa.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
msgid "revoked"
msgstr "revocada"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "caducada"
@@@ -5621,13 -4445,11 +5596,13 @@@ msgstr " Huella de clave =
msgid " Card serial no. ="
msgstr " N�mero de serie de la tarjeta ="
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "memorizando anillo `%s'\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5635,7 -4457,6 +5610,7 @@@ msgid_plural "%lu keys cached so far (%
msgstr[0] "%lu claves memorizadas hasta ahora (%lu firmas)\n"
msgstr[1] "%lu claves memorizadas hasta ahora (%lu firmas)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, fuzzy, c-format
#| msgid "\t%lu keys updated\n"
msgid "%lu key cached"
@@@ -5643,7 -4464,6 +5618,7 @@@ msgid_plural "%lu keys cached
msgstr[0] "\t%lu claves actualizadas\n"
msgstr[1] "\t%lu claves actualizadas\n"
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5651,7 -4471,6 +5626,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 firma incorrecta\n"
msgstr[1] "1 firma incorrecta\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: anillo creado\n"
@@@ -5869,116 -4643,97 +5844,122 @@@ msgstr "revocaci�n independiente - use
msgid "no signature found\n"
msgstr "no se encontr� firma\n"
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, c-format
msgid "BAD signature from \"%s\""
msgstr "Firma INCORRECTA de \"%s\""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Firma caducada de \"%s\""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, c-format
msgid "Good signature from \"%s\""
msgstr "Firma correcta de \"%s\""
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "suprimida la verificaci�n de la firma\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
msgid "can't handle this ambiguous signature data\n"
msgstr "no puedo manejar estos datos ambiguos en la firma\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, c-format
msgid "Signature made %s\n"
msgstr "Firmado el %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, c-format
msgid " using %s key %s\n"
msgstr " usando %s clave %s\n"
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Firmado el %s usando clave %s ID %s\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ #| msgid " aka \"%s\""
+ msgid " issuer \"%s\"\n"
+ msgstr " alias \"%s\""
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "Clave disponible en: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[incierto]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, c-format
msgid " aka \"%s\""
msgstr " alias \"%s\""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "Firma caducada en %s\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "La firma caduca el %s\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "firma %s, algoritmo de resumen %s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "binaria"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "modotexto"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "desconocido"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "Algoritmo de clave p�blica desconocido"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Imposible comprobar la firma: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "no es una firma separada\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "AVISO: detectadas m�ltiples firmas. S�lo la primera se comprueba.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "firma independiente de clase 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "firma al viejo estilo (PGP 2.x)\n"
@@@ -6166,95 -4886,50 +6147,61 @@@ msgstr "
msgid "subpacket of type %d has critical bit set\n"
msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, c-format
msgid "problem with the agent: %s\n"
msgstr "problema con el agente: %s\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, c-format
- msgid " (main key ID %s)"
- msgstr "(ID de clave primaria %s)"
-
- #: g10/passphrase.c:277
- #, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Introduzca frase contrase�a para desbloquear la clave secreta del "
- "certificado OpenPGP:\n"
- "\"%.*s\"\n"
- "con %u bits clave %s, ID %s,\n"
- "creada el %s%s.\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Introduzca frase contrase�a\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "cancelado por el usuario\n"
- #: g10/passphrase.c:483
++#: g10/passphrase.c:489
#, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "Necesita una frase contrase�a para desbloquear la clave secreta\n"
- "del usuario: \"%s\"\n"
-
- #: g10/passphrase.c:491
- #, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "clave %2$s de %1$u bits, ID %3$s, creada el %4$s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr " (subclave en clave principal ID %s)"
+ msgid " (main key ID %s)"
+ msgstr "(ID de clave primaria %s)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
#, fuzzy
#| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Introduzca frase contrase�a para desproteger el objeto PKCS#12."
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Introduzca frase contrase�a para proteger el nuevo objeto PKCS#12."
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Introduzca frase contrase�a para proteger el nuevo objeto PKCS#12."
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Introduzca frase contrase�a para proteger el nuevo objeto PKCS#12."
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, fuzzy, c-format
#| msgid "%u-bit %s key, ID %s, created %s"
msgid ""
@@@ -6454,131 -5094,104 +6401,131 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "�Usar esta clave de todas formas? (s/N) "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "ATENCI�N: �Usando una clave no fiable!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "AVISO: la clave puede estar revocada (falta clave de revocaci�n)\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr ""
"ATENCI�N: �Esta clave ha sido revocada por la persona designada\n"
"como revocador!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
msgid " This could mean that the signature is forged.\n"
msgstr " Esto puede significar que la firma est� falsificada.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Nota: Esta clave est� deshabilitada.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, fuzzy, c-format
#| msgid "Note: Verified signer's address is `%s'\n"
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Nota: la direcci�n del firmante verificado es `%s'\n"
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, fuzzy, c-format
#| msgid "Note: Signer's address `%s' does not match DNS entry\n"
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "Nota: la direcci�n del firmante `%s' no coincide con la entrada DNS\n"
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "nivel de confianza puesto a TOTAL (informaci�n PKA v�lida)\n"
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "nivel de confianza puesto a NUNCA (informaci�n PKA inv�lida)\n"
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Nota: �Esta clave ha caducado!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
"ATENCI�N: �Esta clave no est� certificada por una firma de confianza!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " No hay indicios de que la firma pertenezca al propietario.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ATENCI�N: �Esta clave NO es de confianza!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " La firma es probablemente una FALSIFICACI�N.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"ATENCI�N: �Esta clave no est� certificada con firmas de suficiente "
"confianza!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
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:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: omitido: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: omitida: clave p�blica deshabilitada\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: omitida: clave p�blica ya presente\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, 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:991
++#: g10/pkclist.c:995
#, 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:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr "Destinatarios actuales:\n"
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6586,37 -5199,29 +6533,37 @@@ msgstr "
"\n"
"Introduzca ID de usuario. Acabe con una l�nea vac�a: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "ID de usuario inexistente.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
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:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "Clave p�blica deshabilitada.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "omitida: clave p�blica ya establecida\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "desconocido el destinatario predefinido \"%s\"\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "no hay direcciones v�lidas\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Nota: la clave %s no usa %s\n"
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Nota: clave %s no tiene preferencias para %s\n"
@@@ -6901,7 -5454,6 +6848,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
msgstr[1] "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6981,12 -5524,10 +6928,12 @@@ msgstr "
"AVISO: no puedo expandir el %% de la URL del servidor de claves\n"
"preferido. Se usa sin expandir.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s firma de: \"%s\"\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6994,11 -5535,9 +6941,11 @@@ msgstr "
"AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
"preferencias del destinatario\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "firmando:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "se usar� un cifrado %s\n"
@@@ -7106,7 -5625,6 +7053,7 @@@ msgstr "transacci�n en la base de dato
msgid "%s: directory does not exist!\n"
msgstr "%s: �el directorio no existe!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7218,134 -5714,104 +7165,126 @@@ msgstr "no se pueden manejar l�neas de
msgid "input line longer than %d characters\n"
msgstr "l�nea de longitud superior a %d caracteres\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "error enviando opciones est�ndar: %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "algoritmo no disponible: %s"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "error enviando orden %s: %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "error escribiendo anillo privado `%s': %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: error escribiendo registro de directorio: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "error abriendo `%s': %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "error enviando orden %s: %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "error obteniendo nuevo PIN: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Pol�tica: "
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "error obteniendo par�metros almacenados: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "lista claves"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%ld message signed"
@@@ -7353,21 -5819,18 +7292,21 @@@ msgid_plural "%ld messages signed
msgstr[0] "imprime res�menes de mensaje"
msgstr[1] "imprime res�menes de mensaje"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7377,28 -5840,23 +7316,28 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
#| msgid "error storing flags: %s\n"
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "error almacenando par�metros: %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
@@@ -7406,42 -5864,36 +7345,42 @@@ msgstr "error creando tuber�a: %s\n
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, fuzzy, c-format
#| msgid "second"
msgid "%d~second"
@@@ -7449,25 -5901,21 +7388,25 @@@ msgid_plural "%d~seconds
msgstr[0] "segundo"
msgstr[1] "segundo"
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %ld messages signed by \"%s\"."
msgstr "imprime res�menes de mensaje"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7478,20 -5926,16 +7417,20 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7508,8 -5952,6 +7447,7 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error opening TOFU database: %s\n"
@@@ -8068,7 -6401,6 +8006,7 @@@ msgstr "|N|Nuevo PIN Inicial
msgid "run in multi server mode (foreground)"
msgstr "ejecutar en modo multi servidor (primer plano)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NIVEL|poner el nivel de depurado a NIVEL"
@@@ -8128,19 -6449,16 +8066,19 @@@ msgstr "
"Sintaxis: scdaemon [opciones] [orden [args]]\n"
"Demonio de la tarjeta inteligente para GnuPG\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
#, 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:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr "manejador del descriptor %d iniciado\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "manejador del descriptor %d terminado\n"
@@@ -8244,12 -6539,10 +8182,12 @@@ msgstr "por favor aseg�rese de que \"di
msgid "checking the CRL failed: %s"
msgstr "la comprobaci�n de CRL fall�: %s"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr "validez del certificado incorrecta: %s"
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr "el certificado a�n no es v�lido"
@@@ -8261,7 -6552,6 +8199,7 @@@ msgstr "el certificado ra�z no es v�lid
msgid "intermediate certificate not yet valid"
msgstr "el certificado intermedio a�n no es v�lido"
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
msgid "certificate has expired"
msgstr "certificado caducado"
@@@ -8311,7 -6590,6 +8249,7 @@@ msgstr " (certificado v�lido desde
msgid " ( issuer valid from "
msgstr " ( emisor v�lido desde "
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, c-format
msgid "fingerprint=%s\n"
msgstr "huella dactilar=%s\n"
@@@ -8340,7 -6612,6 +8278,7 @@@ msgstr "no se encuentra el emisor de es
msgid "self-signed certificate has a BAD signature"
msgstr "certificado auto firmado con firma INCORRECTA"
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr "el certificado ra�z no est� marcado como fiable"
@@@ -8349,28 -6619,22 +8287,28 @@@
msgid "checking the trust list failed: %s\n"
msgstr "la comprobaci�n de la lista de confianza fall�: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr "cadena de certificados demasiado larga\n"
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr "no se encuentra emisor del certificado"
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
msgid "certificate has a BAD signature"
msgstr "el certificado tiene una firma INCORRECTA"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr "encontrado otro posible certificado de CA coincidente - reintentando"
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr "cadena de certificados m�s larga de lo que permite la CA (%d)"
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
msgid "certificate is good\n"
msgstr "certificado correcto\n"
@@@ -8400,7 -6658,6 +8338,7 @@@ msgstr "un hash de %u bits no vale par
msgid "(this is the MD2 algorithm)\n"
msgstr "(es el algoritmo MD2)\n"
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
msgid "none"
msgstr "ninguno"
@@@ -8435,44 -6687,36 +8373,44 @@@ msgstr "
"S/N %s, ID 0x%08lX,\n"
"created %s, expires %s.\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr "no se especifica uso de la clave - asumiendo todos los usos\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "error obteniendo informaci�n sobre uso de la clave: %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
#, fuzzy
#| msgid "certificate should have not been used for certification\n"
msgid "certificate should not have been used for certification\n"
msgstr "el certificado no deber�a haberse usado para certificar\n"
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
#, fuzzy
#| msgid "certificate should have not been used for OCSP response signing\n"
msgid "certificate should not have been used for OCSP response signing\n"
msgstr "el certificado no deber�a haberse usado para firma en respuesta OCSP\n"
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
#, fuzzy
#| msgid "certificate should have not been used for encryption\n"
msgid "certificate should not have been used for encryption\n"
msgstr "el certificado no deber�a haberse usado para cifrar\n"
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
#, fuzzy
#| msgid "certificate should have not been used for signing\n"
msgid "certificate should not have been used for signing\n"
msgstr "el certificado no deber�a haberse usado para firmar\n"
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr "el certificado no es utilizable para cifrar\n"
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr "el certificado no es utilizable para firmar\n"
@@@ -8929,23 -7083,19 +8867,23 @@@ msgstr "%s:%u: se dio contrase�a sin us
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: omitir esta l�nea\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
msgid "could not parse keyserver\n"
msgstr "no se puede interpretar el servidor de claves\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, fuzzy, c-format
#| msgid "importing common certificates `%s'\n"
msgid "importing common certificates '%s'\n"
msgstr "importando certificados comunes `%s'\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, 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:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr "orden inv�lida (no hay orden impl�cita)\n"
@@@ -9006,7 -7144,6 +8944,7 @@@ msgstr "problema re-buscando el certifi
msgid "error storing flags: %s\n"
msgstr "error almacenando par�metros: %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr "Error - "
@@@ -9134,112 -7250,87 +9072,106 @@@ msgstr "problema buscando el certificad
msgid "dropping %u certificates from the cache\n"
msgstr "buscando emisor en el cach� de Dirmngr\n"
- #: dirmngr/certcache.c:352
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
- msgid "can't access directory '%s': %s\n"
- msgstr "no se puede crear el directorio `%s': %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't parse certificate '%s': %s\n"
msgstr "no se puede crear %s: %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, fuzzy, c-format
#| msgid "certificate `%s' deleted\n"
msgid "certificate '%s' already cached\n"
msgstr "certificado `%s' borrado\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, fuzzy, c-format
#| msgid "duplicated certificate `%s' deleted\n"
msgid "trusted certificate '%s' loaded\n"
msgstr "certificado duplicado `%s' borrado\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, fuzzy, c-format
#| msgid "certificate `%s' deleted\n"
msgid "certificate '%s' loaded\n"
msgstr "certificado `%s' borrado\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, fuzzy, c-format
#| msgid "fingerprint=%s\n"
msgid " SHA1 fingerprint = %s\n"
msgstr "huella dactilar=%s\n"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error loading certificate '%s': %s\n"
msgstr "error almacenando certificado: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, fuzzy, c-format
#| msgid "Included certificates"
msgid "permanently loaded certificates: %u\n"
msgstr "Certificados incluidos"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, fuzzy, c-format
#| msgid "number of matching certificates: %d\n"
msgid " runtime cached certificates: %u\n"
msgstr "n�mero de certificados coincidentes: %d\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
#, fuzzy
#| msgid " (certificate created at "
msgid "certificate already cached\n"
msgstr " (certificado creado en "
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate cached\n"
msgstr "certificado correcto\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error caching certificate: %s\n"
msgstr "error almacenando certificado: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "huella dactilar no v�lida"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error fetching certificate by S/N: %s\n"
msgstr "error almacenando certificado: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error fetching certificate by subject: %s\n"
msgstr "error almacenando certificado: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
#, fuzzy
#| msgid "no issuer found in certificate"
msgid "no issuer found in certificate\n"
msgstr "no se encuentra el emisor de este certificado"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error getting authorityKeyIdentifier: %s\n"
@@@ -9526,7 -7566,6 +9458,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "error obteniendo par�metros almacenados: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
@@@ -9549,7 -7585,6 +9481,7 @@@ msgstr "respuesta del agente inv�lida\n
msgid "converting S-expression failed: %s\n"
msgstr "al cambiar permisos de `%s' ocurri� el fallo: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, fuzzy, c-format
#| msgid "changing permission of `%s' failed: %s\n"
msgid "creating S-expression failed: %s\n"
@@@ -9986,124 -7941,92 +9918,118 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:159
- #, fuzzy
- #| msgid "run in daemon mode (background)"
- msgid "run as windows service (background)"
- msgstr "ejecutar en modo demonio (segundo plano)"
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
#, 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:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "pasar una orden a dirmngr"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr "|FICHERO|escribir logs en modo servidor en FICHERO"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "�Salir sin grabar? (s/N) "
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "permitir b�squedas PKA (peticiones DNS)"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
#, fuzzy
#| msgid "|FILE|read options from FILE"
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FICHERO|lee opciones desde FICHERO"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 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:209
++#: dirmngr/dirmngr.c:196
#, 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:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
@@@ -10111,7 -8034,6 +10037,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:241
++#: dirmngr/dirmngr.c:228
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10124,13 -8046,11 +10050,13 @@@ msgstr "
"@\n"
"(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Uso: gpgconf [opciones] (-h para ayuda)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10142,88 -8062,71 +10068,88 @@@ msgstr "
"Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
"Manejo de claves privadas por GnuPG\n"
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, fuzzy, c-format
#| msgid "invalid debug-level `%s' given\n"
msgid "valid debug levels are: %s\n"
msgstr "el nivel de depuraci�n `%s` no es v�lido\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "uso: gpgsm [opciones] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
#, 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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, 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:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, 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:1594
++#: dirmngr/dirmngr.c:1418
#, 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:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "huella dactilar no v�lida"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, 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:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "no forzado"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10599,115 -8432,94 +10525,115 @@@ msgstr "al cambiar permisos de `%s' ocu
msgid "not signed by a default OCSP signer's certificate"
msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, fuzzy, c-format
#| msgid "receiving line failed: %s\n"
msgid "allocating list item failed: %s\n"
msgstr "fallo recibiendo la l�nea: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error getting responder ID: %s\n"
msgstr "error obteniendo nuevo PIN: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
#, fuzzy
#| msgid "certificate should have not been used for OCSP response signing\n"
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr "el certificado no deber�a haberse usado para firma en respuesta OCSP\n"
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, fuzzy, c-format
#| msgid "issuer certificate not found"
msgid "issuer certificate not found: %s\n"
msgstr "no se encuentra emisor del certificado"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
#, fuzzy
#| msgid "error reading list of trusted root certificates\n"
msgid "caller did not return the target certificate\n"
msgstr "error leyendo la lista de certificados ra�z fiables\n"
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
#, fuzzy
#| msgid "error storing certificate\n"
msgid "caller did not return the issuing certificate\n"
msgstr "error almacenando certificado\n"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, fuzzy, c-format
#| msgid "failed to allocate keyDB handle\n"
msgid "failed to allocate OCSP context: %s\n"
msgstr "fallo al reservar handle de keyDB\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, fuzzy, c-format
#| msgid "%s: can't access: %s\n"
msgid "can't get authorityInfoAccess: %s\n"
msgstr "%s: no se puede abrir: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
#, fuzzy
#| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
msgstr "no hay anillo secreto de claves por defecto: %s\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, fuzzy, c-format
#| msgid "using default PIN as %s\n"
msgid "using default OCSP responder '%s'\n"
msgstr "usando PIN por defecto %s\n"
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, fuzzy, c-format
#| msgid "using cipher %s\n"
msgid "using OCSP responder '%s'\n"
msgstr "usando cifrado %s\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "error almacenando certificado: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, fuzzy, c-format
#| msgid "certificate has been revoked"
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "el certificado ha sido revocado"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr ""
@@@ -10761,37 -8563,31 +10687,37 @@@ msgstr "select fallido: %s\n
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, 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:2415
++#: dirmngr/server.c:2377
#, 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:2436
++#: dirmngr/server.c:2398
#, 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:2444
++#: dirmngr/server.c:2406
#, 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:2475
++#: dirmngr/server.c:2437
#, 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:2494
++#: dirmngr/server.c:2456
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10819,39 -8611,29 +10745,35 @@@ msgstr "
msgid "checking CRL for"
msgstr "la comprobaci�n de CRL fall�: %s"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
#, fuzzy
#| msgid "self-signed certificate has a BAD signature"
msgid "selfsigned certificate has a BAD signature"
msgstr "certificado auto firmado con firma INCORRECTA"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, fuzzy, c-format
#| msgid "checking for qualified certificate failed: %s\n"
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "la comprobaci�n de la firma cualificada fall�: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate chain is good\n"
msgstr "certificado correcto\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA necesita un algoritmo de hash de 160 bits.\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
#, fuzzy
#| msgid "certificate should have not been used for signing\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:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
msgid "quiet"
msgstr "silencioso"
@@@ -10988,11 -8739,9 +10910,11 @@@ msgstr "|N|establecer vida m�xima de l
msgid "Options enforcing a passphrase policy"
msgstr "Opciones que fuerzan una pol�tica de frases contrase�a"
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr "no permitir evitar la pol�tica de frases contrase�a"
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|establecer longitud m�nima para nuevas frases contrase�a en N"
@@@ -11142,77 -8859,61 +11064,77 @@@ msgstr "Verificaci�n externa del compon
msgid "Note that group specifications are ignored\n"
msgstr "Note que las especificaci�n de grupo se ignoran\n"
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr "listar todos los componentes"
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr "comprobar todos los programas"
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr "|COMPONENTE|lista de opciones"
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr "|COMPONENTE|cambiar opciones"
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr "|COMPONENTE|comprobar opciones"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr "aplicar valores globales por defecto"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
#, 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:78
++#: tools/gpgconf.c:79
msgid "list global configuration file"
msgstr "listar fichero de configuraci�n global"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
msgid "check global configuration file"
msgstr "comprobar fichero global de configuraci�n"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
#, fuzzy
#| msgid "list all components"
msgid "reload all or a given component"
msgstr "listar todos los componentes"
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
#, fuzzy
#| msgid "list all components"
msgid "launch a given component"
msgstr "listar todos los componentes"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
#, fuzzy
#| msgid "list all components"
msgid "kill a given component"
msgstr "listar todos los componentes"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "usa como fichero de salida"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr "activar cambios en tiempo de ejecuci�n, si es posible"
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
#, 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:119
++#: tools/gpgconf.c:121
#, fuzzy
#| msgid ""
#| "Syntax: gpgconf [options]\n"
@@@ -11224,15 -8925,12 +11146,15 @@@ msgstr "
"Sintaxis: gpgconf [opciones]\n"
"Administrar opciones de configuraci�n de las herramientas GnuPG\n"
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr "Necesita un argumento de un componente"
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
msgid "Component not found"
msgstr "Componente no encontrado"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
msgid "No argument allowed"
msgstr "No se permiten par�metros"
@@@ -11288,123 -8977,98 +11210,123 @@@ msgstr "
"[opciones...] ORDEN [fichero entrada]\n"
"Invocar una herramienta simple de cifrado sim�trico\n"
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s en %s abort� con estado %i\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, c-format
msgid "%s on %s failed with status %i\n"
msgstr "%s en %s fall� con estado %i\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, fuzzy, c-format
#| msgid "can't create temporary directory `%s': %s\n"
msgid "can't create temporary directory '%s': %s\n"
msgstr "no se puede crear el directorio temporal `%s': %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr "no se puede abrir %s para escribir: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, c-format
msgid "error writing to %s: %s\n"
msgstr "error escribiendo en %s: %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, c-format
msgid "error reading from %s: %s\n"
msgstr "error leyendo de %s: %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, c-format
msgid "error closing %s: %s\n"
msgstr "error cerrando %s: %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
msgid "no --program option provided\n"
msgstr "falta la opci�n --program\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr "s�lo pueden usarse --decrypt y --encrypt\n"
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr "falta la opci�n --keyfile\n"
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr "no puedo reservar espacio para el vector de par�metros\n"
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, c-format
msgid "could not create pipe: %s\n"
msgstr "no se pudo crear la tuber�a: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, c-format
msgid "could not create pty: %s\n"
msgstr "no se pudo crear pty: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr "no se puede bifurcar: %s\n"
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, c-format
msgid "execv failed: %s\n"
msgstr "execv fallido: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, c-format
msgid "select failed: %s\n"
msgstr "select fallido: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, c-format
msgid "read failed: %s\n"
msgstr "lectura fallida: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, c-format
msgid "pty read failed: %s\n"
msgstr "lectura de pty fallida: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, c-format
msgid "waitpid failed: %s\n"
msgstr "waitpid fallido: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr "proceso hijo abortado con estado %i\n"
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "no puedo reservar espacio para la cadena de entrada: %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "no puedo reservar espacio para la cadena de salida: %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr "debe darse %s o bien %s\n"
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr "se necesita una clase\n"
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, c-format
msgid "class %s is not supported\n"
msgstr "la clase %s no puede usarse\n"
diff --cc po/et.po
index 9607c03,b7dc277..ea697fe
--- a/po/et.po
+++ b/po/et.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2004-06-17 11:04+0300\n"
"Last-Translator: Toomas Soome <Toomas.Soome at microlink.ee>\n"
"Language-Team: Estonian <et at li.org>\n"
@@@ -98,14 -82,10 +98,14 @@@ msgstr "Palun sisestage parool; see on
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
#, fuzzy
msgid "Passphrase:"
msgstr "halb parool"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr ""
@@@ -150,98 -122,70 +150,98 @@@ msgstr "halb MPI
msgid "Bad Passphrase"
msgstr "halb parool"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "kaitse algoritm %d%s ei ole toetatud\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, 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:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
msgstr "`%s' ei �nnestu avada: %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, fuzzy, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, fuzzy, c-format
msgid "shadowing the key failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, fuzzy, c-format
msgid "error writing key: %s\n"
msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "muuda parooli"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
"%s%%0Awithin gpg-agent's key storage"
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
@@@ -382,8 -300,6 +382,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "muuda parooli"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -393,118 -309,87 +393,118 @@@ msgstr "
"V�tmed:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "ole jutukas"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ole m�nev�rra vaiksem"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "otsi v�tmeid v�tmeserverist"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "uuenda usalduse andmebaasi"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, 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:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "viga parooli loomisel: %s\n"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
#, fuzzy
msgid "allow presetting passphrase"
msgstr "viga parooli loomisel: %s\n"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "ei ole toetatud"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -513,134 -398,92 +513,126 @@@ 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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Palun saatke veateated aadressil <gnupg-bugs at gnu.org>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr ""
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "v�tmete fail `%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, 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:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s ei �nnestu luua: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
#, 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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "viga parooli loomisel: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, 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:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: kataloog on loodud\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: kataloogi ei �nnestu luua: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
@@@ -655,28 -496,22 +647,28 @@@ msgstr "
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2390
++#: agent/gpg-agent.c:2392
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: j�tsin vahele: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
@@@ -692,8 -525,6 +684,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -701,9 -532,6 +693,9 @@@ msgstr "
"@K�sud:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -724,40 -550,33 +716,40 @@@ msgid "
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
#, fuzzy
msgid "cancelled\n"
msgstr "Katkesta"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, fuzzy, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
@@@ -927,42 -717,30 +919,42 @@@ msgstr "kaitse algoritm %d%s ei ole toe
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "kaitse algoritm %d%s ei ole toetatud\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "viga `%s' lugemisel: %s\n"
@@@ -977,37 -753,15 +969,18 @@@ msgstr "viga salajase v�tme v�tmehoidla
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "probleem gpg-agent programmiga suhtlemisel\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
#, fuzzy
msgid "problem setting the gpg-agent options\n"
msgstr "probleem agendiga: agent tagastas 0x%lx\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- #, fuzzy
- msgid "canceled by user\n"
- msgstr "katkestatud kasutaja poolt\n"
-
- #: common/simple-pwquery.c:579
- #, fuzzy
- msgid "problem with the agent\n"
- msgstr "probleem agendiga: agent tagastas 0x%lx\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "probleem agendiga: agent tagastas 0x%lx\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "ei �nnestu blokeerida m�lupildi salvestamist: %s\n"
@@@ -1093,7 -830,6 +1066,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1117,17 -849,14 +1090,17 @@@ msgstr "
msgid "connection to agent is in restricted mode\n"
msgstr "seda ei saa teha pakettmoodis\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr ""
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1421,7 -1090,6 +1394,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
#, fuzzy
msgid "out of core\n"
msgstr "ei t��deldud"
@@@ -1480,7 -1137,10 +1453,13 @@@ msgstr "ei leia avalikku v�tit %08lX: %
msgid "waiting for lock %s...\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr ""
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "pakend: %s\n"
@@@ -1730,10 -1335,6 +1709,10 @@@ msgstr "vastavat avalikku v�tit pole: %
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
@@@ -2032,27 -1568,18 +2011,27 @@@ msgstr "kirjutan salajase v�tme faili `
msgid "Invalid command (try \"help\")\n"
msgstr "Vigane k�sklus (proovige \"help\")\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "v�ti --output ei t��ta selle k�suga\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "`%s' ei �nnestu avada\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, 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:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "viga v�tmebloki lugemisel: %s\n"
@@@ -2114,46 -1629,38 +2093,46 @@@ msgstr "avaliku v�tme \"%s\" jaoks on s
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "S2K moodi t�ttu ei saa s�mmeetrilist ESK paketti kasutada\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "kasutan �iffrit %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' on juba pakitud\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "HOIATUS: `%s' on t�hi fail\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "loen failist `%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2161,18 -1668,15 +2140,18 @@@
msgstr ""
"pakkimise algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "%s ei ole moodis %s lubatud.\n"
@@@ -2287,8 -1770,6 +2266,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: j�tsin vahele: %s\n"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2325,8 -1799,6 +2304,8 @@@ msgstr "viga `%s' loomisel: %s\n
msgid "[User ID not found]"
msgstr "[Kasutaja id puudub]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "vigased impordi v�tmed\n"
@@@ -2397,218 -1856,169 +2376,218 @@@ msgstr "
msgid "using subkey %s instead of primary key %s\n"
msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "loo eraldiseisev allkiri"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
#, fuzzy
msgid "make a clear text signature"
msgstr "|[fail]|loo avateksti allkiri"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "loo eraldiseisev allkiri"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "kr�pteeri andmed"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "dekr�pteeri andmed (vaikimisi)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "kontrolli allkirja"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "n�ita v�tmeid"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "n�ita v�tmeid ja allkirju"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "list and check key signatures"
msgstr "kontrolli v�tmete allkirju"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "n�ita v�tmeid ja s�rmej�lgi"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "n�ita salajasi v�tmeid"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "genereeri uus v�tmepaar"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genereeri uus v�tmepaar"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genereeri uus v�tmepaar"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "genereeri uus v�tmepaar"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "genereeri t�histamise sertifikaat"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "eemalda v�tmed avalike v�tmete hoidlast"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "allkirjasta v�ti"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "allkirjasta v�ti lokaalselt"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "allkirjasta v�ti"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "allkirjasta v�ti lokaalselt"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "allkirjasta v�i toimeta v�tit"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "muuda parooli"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "ekspordi v�tmed"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "ekspordi v�tmed v�tmeserverisse"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "impordi v�tmed v�tmeserverist"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "otsi v�tmeid v�tmeserverist"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "uuenda v�tmeid v�tmeserverist"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "impordi/mesti v�tmed"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "uuenda usalduse andmebaasi"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
#, fuzzy
msgid "print message digests"
msgstr "|algo [failid]|tr�ki teatel�hendid"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "loo ascii pakendis v�ljund"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NIMI|kr�pti NIMEle"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "kasuta seda kasutaja IDd"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "kasuta kanoonilist tekstimoodi"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "�ra tee mingeid muutusi"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "k�si enne �lekirjutamist"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2616,7 -2026,6 +2595,7 @@@ msgstr "
"@\n"
"(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2636,13 -2045,11 +2615,13 @@@ msgstr "
" --list-keys [nimed] n�ita v�tmeid\n"
" --fingerprint [nimed] n�ita s�rmej�lgi\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2657,7 -2064,6 +2636,7 @@@ msgstr "
"allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
"vaikimisi operatsioon s�ltub sisendandmetest\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2665,605 -2071,471 +2644,600 @@@ msgstr "
"\n"
"Toetatud algoritmid:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "Avalik v�ti: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "�iffer: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "R�si: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Pakkimine: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "kasuta: gpg [v�tmed] "
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "vastuolulised k�sud\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "tundmatu seade \"%s\"\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "blokeeri v�ti"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "tundmatu vaikimisi saaja `%s'\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, fuzzy, c-format
#| msgid "NOTE: old default options file `%s' ignored\n"
msgid "Note: old default options file '%s' ignored\n"
msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr ""
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "Selline e-posti aadress ei ole lubatud\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "vigane r�sialgoritm `%s'\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ei saa parsida v�tmeserveri URI\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: vigased impordi v�tmed\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "vigased impordi v�tmed\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "vigased impordi v�tmed\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: vigased impordi v�tmed\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
#, fuzzy
msgid "invalid list options\n"
msgstr "vigased impordi v�tmed\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
#, fuzzy
msgid "invalid verify options\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "HOIATUS: %s m��rab �le %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s ei ole koos lubatud!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s ei oma koos m�tet!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "valitud l�hendi algoritm ei ole lubatud\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed peab olema suurem, kui 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed peab olema suurem, kui 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "vigased vaikimisi eelistused\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "vigased isikliku �ifri eelistused\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "vigased isikliku l�hendi eelistused\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "vigased isikliku pakkimise eelistused\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ei t��ta veel koos %s-ga\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, fuzzy, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "�ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, fuzzy, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, fuzzy, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [failinimi]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [failinimi]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [failinimi]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "%s ei ole moodis %s lubatud.\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [failinimi]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "%s ei ole moodis %s lubatud.\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [failinimi]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [failinimi]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [failinimi]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key kasutaja-id"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key kasutaja-id"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kasutaja-id [k�sud]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key kasutaja-id"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "v�tme eksport eba�nnestus: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "v�tme eksport eba�nnestus: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "lahtipakendamine eba�nnestus: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "vigane r�sialgoritm `%s'\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[failinimi]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Kirjutage n��d oma teade ...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "antud sertifikaadi poliisi URL on vigane\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
@@@ -3308,329 -2572,263 +3282,329 @@@ msgstr "Abiinfo puudub
msgid "No help available for '%s'"
msgstr "`%s' kohta abiinfo puudub"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "uuenda usalduse andmebaasi"
- #: g10/import.c:143
++#: g10/import.c:147
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "uuenda usalduse andmebaasi"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
msgid "show key during import"
msgstr "n�ita s�rmej�lge"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:152
++#: g10/import.c:156
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "mittekasutatav salajane v�ti"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "j�tan bloki t��biga %d vahele\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu v�tit on seni t��deldud\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "T��deldud kokku: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " vahele j�etud uusi v�tmeid: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " vahele j�etud uusi v�tmeid: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " puudub kasutaja ID: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " imporditud: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " muutmata: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " uusi kasutajaid: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " uusi alamv�tmeid: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " uusi allkirju: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " uusi t�histamisi: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " loetud salajasi v�tmeid: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " salajasi v�tmeid imporditud: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " muutmata salajasi v�tmeid: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " pole imporditud: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " uusi allkirju: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " loetud salajasi v�tmeid: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1042
++#: g10/import.c:1048
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "v�ti %08lX: kasutaja ID puudub\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "`%s' j�tsin vahele: %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1264
++#: g10/import.c:1343
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr ""
"v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "see v�ib olla p�hjustatud puuduvast iseenda allkirjast\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "v�ti %08lX: avalik v�ti \"%s\" on imporditud\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "v�ti %08lX: ei �nnestu lugeda algset v�tmeblokki: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "v�ti %08lX: \"%s\" 1 uus kasutaja ID\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "salajast v�tit `%s' ei leitud: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "v�ti %08lX: salajane v�ti vigase �ifriga %d - j�tsin vahele\n"
@@@ -3645,140 -2843,113 +3619,140 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"v�ti %08lX: avalik v�ti puudub - t�histamise sertifikaati ei saa rakendada\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - l�kkasin tagasi\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm kasutajaga \"%s\"\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "v�ti %08lX: vigane alamv�tme seos\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "v�ti %08lX: v�tme t�histamiseks puudub alamv�ti\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "v�ti %08lX: eemaldasin mitme alamv�tme t�histamise\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - j�tan vahele\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"HOIATUS: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"HOIATUS: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
@@@ -4137,8 -3246,6 +4111,8 @@@ msgstr "
msgid "Really sign? (y/N) "
msgstr "Allkirjastan t�esti? "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "allkirjastamine eba�nnestus: %s\n"
@@@ -4622,14 -3627,10 +4596,14 @@@ msgstr "
"Tuleb t�hele panna et kuni te pole programmi uuesti k�ivitanud, ei pruugi\n"
"n�idatud v�tme kehtivus olla tingimata korrektne.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
#, fuzzy
msgid "revoked"
msgstr "[t�histatud] "
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5580,26 -4403,22 +5554,26 @@@ msgstr " V�tme s�rmej�lg =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "kontrollin v�tmehoidlat `%s'\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "kontrollitud %lu v�tit (%lu allkirja)\n"
msgstr[1] "kontrollitud %lu v�tit (%lu allkirja)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5607,7 -4426,6 +5581,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 halb allkiri\n"
msgstr[1] "1 halb allkiri\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: v�tmehoidla on loodud\n"
@@@ -5827,117 -4600,97 +5801,122 @@@ msgstr "eraldiseisev t�histus - realise
msgid "no signature found\n"
msgstr "Korrektne allkiri kasutajalt \""
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "HALB allkiri kasutajalt \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Aegunud allkiri kasutajalt \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Korrektne allkiri kasutajalt \""
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "allkirja kontroll j�eti �ra\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "neid allkirju ei �nnestu t��delda\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Allkiri aegus %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " ka \""
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Allkirja l�i %.*s kasutades %s v�tit ID %08lX\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ msgid " issuer \"%s\"\n"
+ msgstr " ka \""
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "V�tme leiate: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[ebakindel]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " ka \""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "Allkiri aegus %s\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "Allkiri aegub %s\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "binaarne"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "tekstimood"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "tundmatu"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "tundmatu avaliku v�tme algoritm"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Allkirja ei saa kontrollida: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "ei ole eraldiseisev allkiri\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "vana stiili (PGP 2.x) allkiri\n"
@@@ -6121,88 -4839,44 +6100,55 @@@ msgstr "
msgid "subpacket of type %d has critical bit set\n"
msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "probleem agendiga: agent tagastas 0x%lx\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, fuzzy, c-format
- msgid " (main key ID %s)"
- msgstr " (peamise v�tme ID %08lX)"
-
- #: g10/passphrase.c:277
- #, fuzzy, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Te vajate kasutaja salajase v�tme lahtilukustamiseks parooli:\n"
- "\"%.*s\"\n"
- "%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Sisestage parool\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "katkestatud kasutaja poolt\n"
- #: g10/passphrase.c:483
++#: g10/passphrase.c:489
#, fuzzy, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "\n"
- "Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
- "parooli: \""
-
- #: g10/passphrase.c:491
- #, fuzzy, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr ""
+ msgid " (main key ID %s)"
+ msgstr " (peamise v�tme ID %08lX)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6404,125 -5043,98 +6350,125 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "Kasutan seda v�tit ikka? "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "HOIATUS: Kasutan mitteusaldatavat v�tit!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "HOIATUS: see v�ti v�ib olla t�histatud (t�histamise v�tit pole)\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "HOIATUS: See v�ti on omaniku poolt t�histatud!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " See v�ib t�hendada, et allkiri on v�ltsing.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "HOIATUS: See alamv�ti on omaniku poolt t�histatud!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "M�rkus: See v�ti on blokeeritud.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "M�rkus: See v�ti on aegunud!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "HOIATUS: Seda v�tit ei ole sertifitseeritud usaldatava allkirjaga!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Ei ole midagi, mis n�itaks, et allkiri kuulub omanikule.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "HOIATUS: Me EI usalda seda v�tit!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " Allkiri on t�en�oliselt V�LTSING.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"HOIATUS: Seda v�tit ei ole sertifitseeritud piisavalt usaldatava "
"allkirjaga!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
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:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: j�tsin vahele: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, 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:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "vigane r�sialgoritm `%s'\n"
- #: g10/pkclist.c:991
++#: g10/pkclist.c:995
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "vigane r�sialgoritm `%s'\n"
- #: g10/pkclist.c:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6530,37 -5142,29 +6476,37 @@@ msgstr "
"\n"
"Sisestage kasutaja ID. L�petage t�hja reaga: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Tundmatu kasutaja ID.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
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:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "Avalik v�ti on blokeeritud.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "kehtivaid aadresse pole\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "v�ti %08lX: kasutaja ID puudub\n"
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "v�ti %08lX: kasutaja ID puudub\n"
@@@ -6844,7 -5396,6 +6790,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "avalik v�ti %08lX on %lu sekund uuem, kui allkiri\n"
msgstr[1] "avalik v�ti %08lX on %lu sekund uuem, kui allkiri\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6910,23 -5452,19 +6856,23 @@@ msgstr "
"HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
"kompaktset.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s allkiri kasutajalt: \"%s\"\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "allkirjastan:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "kasutatakse %s kr�pteerimist\n"
@@@ -7034,7 -5552,6 +6980,7 @@@ msgstr "trustdb transaktsioon on liiga
msgid "%s: directory does not exist!\n"
msgstr "%s: kataloogi ei ole!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "`%s' ei �nnestu sulgeda: %s\n"
@@@ -7146,150 -5641,117 +7092,142 @@@ msgstr "ei suuda k�sitleda tekstiridu m
msgid "input line longer than %d characters\n"
msgstr "sisendrida on pikem, kui %d s�mbolit\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Toetatud algoritmid:\n"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Poliis: "
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "n�ita v�tmeid"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [failid]|tr�ki teatel�hendid"
msgstr[1] "|algo [failid]|tr�ki teatel�hendid"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7299,93 -5761,78 +7237,93 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "viga parooli loomisel: %s\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
msgid "Verified %ld messages signed by \"%s\"."
msgstr "|algo [failid]|tr�ki teatel�hendid"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7396,20 -5843,16 +7334,20 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7426,8 -5869,6 +7364,7 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
@@@ -7966,7 -6298,6 +7903,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8022,16 -6342,13 +7959,16 @@@ msgid "
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8136,12 -6430,10 +8073,12 @@@ msgstr "
msgid "checking the CRL failed: %s"
msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr ""
@@@ -8154,7 -6444,6 +8091,7 @@@ msgstr "kirjutan salajase v�tme faili `
msgid "intermediate certificate not yet valid"
msgstr ""
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
#, fuzzy
msgid "certificate has expired"
msgstr "See v�ti on aegunud!"
@@@ -8210,7 -6488,6 +8147,7 @@@ msgstr "halb sertifikaat
msgid " ( issuer valid from "
msgstr ""
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "n�ita s�rmej�lge"
@@@ -8240,7 -6511,6 +8177,7 @@@ msgstr "genereeri t�histamise sertifika
msgid "self-signed certificate has a BAD signature"
msgstr ""
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr ""
@@@ -8249,29 -6518,23 +8186,29 @@@
msgid "checking the trust list failed: %s\n"
msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr ""
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr ""
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "kontrolli allkirja"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr ""
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
#, fuzzy
msgid "certificate is good\n"
msgstr "eelistus %c%lu on duplikaat\n"
@@@ -8304,7 -6561,6 +8241,7 @@@ msgstr "
msgid "(this is the MD2 algorithm)\n"
msgstr ""
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
#, fuzzy
msgid "none"
msgstr "ei"
@@@ -8340,36 -6591,28 +8277,36 @@@ msgstr "
"\"%.*s\"\n"
"%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr ""
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr ""
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr ""
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr ""
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr ""
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr ""
@@@ -8809,22 -6962,18 +8746,22 @@@ msgstr "
msgid "%s:%u: skipping this line\n"
msgstr " j = j�ta see v�ti vahele\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "ei saa parsida v�tmeserveri URI\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "kirjutan faili `%s'\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "`%s' ei �nnestu sulgeda: %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8887,7 -7024,6 +8824,7 @@@ msgstr "rev? probleem t�histamise kontr
msgid "error storing flags: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr ""
@@@ -9006,98 -7121,73 +8943,92 @@@ msgstr "
msgid "dropping %u certificates from the cache\n"
msgstr ""
- #: dirmngr/certcache.c:352
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
- msgid "can't access directory '%s': %s\n"
- msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't parse certificate '%s': %s\n"
msgstr "`%s' ei �nnestu luua: %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, fuzzy, c-format
msgid "certificate '%s' already cached\n"
msgstr "eelistus %c%lu on duplikaat\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, fuzzy, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "T�histamise sertifikaat on loodud.\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, fuzzy, c-format
msgid "certificate '%s' loaded\n"
msgstr "eelistus %c%lu on duplikaat\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, fuzzy, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr "n�ita s�rmej�lge"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, fuzzy, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, fuzzy, c-format
msgid "permanently loaded certificates: %u\n"
msgstr "halb sertifikaat"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, fuzzy, c-format
msgid " runtime cached certificates: %u\n"
msgstr "viga parooli loomisel: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
#, fuzzy
msgid "certificate already cached\n"
msgstr "T�histamise sertifikaat on loodud.\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
#, fuzzy
msgid "certificate cached\n"
msgstr "eelistus %c%lu on duplikaat\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, fuzzy, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "viga: vigane s�rmej�lg\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, fuzzy, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, fuzzy, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
#, fuzzy
msgid "no issuer found in certificate\n"
msgstr "genereeri t�histamise sertifikaat"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, fuzzy, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "viga parooli loomisel: %s\n"
@@@ -9358,7 -7397,6 +9289,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
@@@ -9380,7 -7415,6 +9311,7 @@@ msgstr "vigane vastus agendilt\n
msgid "converting S-expression failed: %s\n"
msgstr "faili ei �nnestu avada: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
@@@ -9776,116 -7730,85 +9707,112 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr ""
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
#, fuzzy
msgid "run without asking a user"
msgstr "V�ljun salvestamata? "
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "ei saa parsida v�tmeserveri URI\n"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9898,91 -7821,72 +9825,91 @@@ msgstr "
"@\n"
"(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "kasuta: gpg [v�tmed] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
#, 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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "rida on liiga pikk\n"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "viga: vigane s�rmej�lg\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "viga lugemisel: %s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
#, fuzzy
msgid "shutdown forced\n"
msgstr "ei t��deldud"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10326,103 -8160,82 +10253,103 @@@ msgstr "Loodud allkirja ei �nnestu kont
msgid "not signed by a default OCSP signer's certificate"
msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, fuzzy, c-format
msgid "allocating list item failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, fuzzy, c-format
msgid "error getting responder ID: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr ""
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, fuzzy, c-format
msgid "issuer certificate not found: %s\n"
msgstr "v�tit '%s' ei leitud: %s\n"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr ""
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
#, fuzzy
msgid "caller did not return the issuing certificate\n"
msgstr "genereeri t�histamise sertifikaat"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, fuzzy, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, fuzzy, c-format
#| msgid "%s: can't access: %s\n"
msgid "can't get authorityInfoAccess: %s\n"
msgstr "%s: ei �nnestu kasutada: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
#, fuzzy
#| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr ""
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, fuzzy, c-format
#| msgid "using cipher %s\n"
msgid "using OCSP responder '%s'\n"
msgstr "kasutan �iffrit %s\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, fuzzy, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, fuzzy, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "M�RKUS: v�ti on t�histatud"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr ""
@@@ -10470,33 -8273,27 +10397,33 @@@ msgstr "v�tmebloki kustutamine eba�nnes
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "`%s' ei �nnestu luua: %s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, 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:2444
++#: dirmngr/server.c:2406
#, 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:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10521,34 -8314,24 +10448,30 @@@ msgstr "
msgid "checking CRL for"
msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
#, fuzzy
msgid "selfsigned certificate has a BAD signature"
msgstr "kontrolli allkirja"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, fuzzy, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
#, fuzzy
msgid "certificate chain is good\n"
msgstr "eelistus %c%lu on duplikaat\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA n�uab 160 bitist r�sialgoritmi kasutamist\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "v�lju"
@@@ -10676,11 -8428,9 +10599,11 @@@ msgstr "
msgid "Options enforcing a passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
@@@ -10820,85 -8538,66 +10743,85 @@@ msgstr "
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
#, fuzzy
msgid "list global configuration file"
msgstr "tundmatu seade \"%s\"\n"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
#, fuzzy
msgid "check global configuration file"
msgstr "tundmatu seade \"%s\"\n"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "kasuta v�ljundfailina"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
#, fuzzy
msgid "Component not found"
msgstr "ei leia avalikku v�tit"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
#, fuzzy
msgid "No argument allowed"
msgstr "kirjutan salajase v�tme faili `%s'\n"
@@@ -10952,123 -8642,98 +10875,123 @@@ msgid "
"Call a simple symmetric encryption tool\n"
msgstr ""
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s ja %s ei ole koos lubatud!\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "faili ei �nnestu avada: %s\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, fuzzy, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "%s ei �nnestu avada: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
#, fuzzy
msgid "no --program option provided\n"
msgstr "mittelokaalse programmi k�ivitamist ei toetata\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr ""
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr ""
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "%s ei �nnestu luua: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "%s ei �nnestu luua: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr ""
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "`%s' ei �nnestu luua: %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "`%s' ei �nnestu luua: %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr ""
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "kaitse algoritm %d%s ei ole toetatud\n"
diff --cc po/fi.po
index f49ba47,5002410..ec54f10
--- a/po/fi.po
+++ b/po/fi.po
@@@ -22,7 -22,6 +22,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2004-06-16 22:40+0300\n"
"Last-Translator: Tommi Vainikainen <Tommi.Vainikainen at iki.fi>\n"
"Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@@ -114,14 -98,10 +114,14 @@@ msgstr "Ole hyvä ja syötä salasana,
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
#, fuzzy
msgid "Passphrase:"
msgstr "väärä salasana"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr ""
@@@ -166,98 -138,70 +166,98 @@@ msgstr "MPI ei kelpaa
msgid "Bad Passphrase"
msgstr "väärä salasana"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, 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:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, fuzzy, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, fuzzy, c-format
msgid "shadowing the key failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, fuzzy, c-format
msgid "error writing key: %s\n"
msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "muuta salasanaa"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
"%s%%0Awithin gpg-agent's key storage"
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
@@@ -398,8 -316,6 +398,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "muuta salasanaa"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -409,118 -325,87 +409,118 @@@ msgstr "
"Valitsimet:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "monisanainen"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ole jonkinverran hiljaisempi"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "etsi avaimia avainpalvelimelta"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "päivitä luottamustietokanta"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, 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:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
#, fuzzy
msgid "allow presetting passphrase"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "ei tuettu"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -529,135 -414,93 +529,127 @@@ 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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs at gnu.org>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr ""
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "asetustiedosto \"%s\": %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, 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:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "ei voida luoda kohdetta %s: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
#, 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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, 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:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, 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:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: hakemisto luotu\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: hakemistoa ei voi luoda: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -672,28 -513,22 +664,28 @@@ msgstr "
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2390
++#: agent/gpg-agent.c:2392
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "salaisen päivitys epäonnistui: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ohitettu: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
@@@ -709,8 -542,6 +701,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -718,9 -549,6 +710,9 @@@ msgstr "
"@Komennot:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -741,40 -567,33 +733,40 @@@ msgid "
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
#, fuzzy
msgid "cancelled\n"
msgstr "Peru"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, fuzzy, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -944,42 -734,30 +936,42 @@@ msgstr "suojausalgoritmi %d%s ei ole k�
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -994,37 -770,15 +986,18 @@@ msgstr "virhe kirjoitettaessa salaisee
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "gpg-agentin kanssa yhteysongelma\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
#, fuzzy
msgid "problem setting the gpg-agent options\n"
msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- #, fuzzy
- msgid "canceled by user\n"
- msgstr "käyttäjän peruma\n"
-
- #: common/simple-pwquery.c:579
- #, fuzzy
- msgid "problem with the agent\n"
- msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "core-tiedostojen luontia ei voi estää: %s\n"
@@@ -1110,7 -847,6 +1083,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1134,17 -866,14 +1107,17 @@@ msgstr "
msgid "connection to agent is in restricted mode\n"
msgstr "tätä ei voi tehdä eräajossa\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr ""
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1438,7 -1107,6 +1411,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
#, fuzzy
msgid "out of core\n"
msgstr "ei käsitelty"
@@@ -1497,7 -1154,10 +1470,13 @@@ msgstr "julkista avainta %08lX ei löyd
msgid "waiting for lock %s...\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr ""
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "ascii-koodaus: %s\n"
@@@ -1749,10 -1354,6 +1728,10 @@@ msgstr "ei vastaavaa julkista avainta:
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
@@@ -2051,27 -1587,18 +2030,27 @@@ msgstr "kirjoitan salaisen avaimen koht
msgid "Invalid command (try \"help\")\n"
msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "tiedostoa \"%s\" ei voi avata\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, 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:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "virhe luettaessa avainlohkoa: %s\n"
@@@ -2133,62 -1648,51 +2112,62 @@@ msgstr "julkiselle avaimelle \"%s\" lö
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "symmetristä ESK-pakettia ei voi käyttää S2K-tilan vuoksi\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "käytetään salakirjoitusalgoritmia %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "\"%s\" on jo pakattu\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "luetaan kohteesta \"%s\"\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "valittu pakkausalgoritmi %s (%d) ei ole vastaanottajan suosima\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
@@@ -2302,8 -1785,6 +2281,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: ohitettu: %s\n"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2340,8 -1814,6 +2319,8 @@@ msgstr "virhe luotaessa \"%s\": %s\n
msgid "[User ID not found]"
msgstr "[Käyttäjätunnusta ei löytynyt]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "virheelliset tuontivalitsimet\n"
@@@ -2412,218 -1871,169 +2391,218 @@@ msgid "using subkey %s instead of prima
msgstr ""
"käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "tee erillinen allekirjoitus"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
#, fuzzy
msgid "make a clear text signature"
msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "tee erillinen allekirjoitus"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "salaa tiedot"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "salaa vain symmetrisellä salaimella"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "avaa tiedot (oletus)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "tarkista allekirjoitus"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "näytä avaimet"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "näytä avaimet allekirjoituksineen"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "list and check key signatures"
msgstr "tarkista avainten allekirjoitukset"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "näytä avaimet sormenjälkineen"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "näytä salaiset avaimet"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "luo mitätöintivarmenne"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "poista avaimet julkisten avainten renkaasta"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "poista avaimet salaisten avainten renkaasta"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "allekirjoita avain"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "allekirjoita avain paikallisesti"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "allekirjoita avain"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "allekirjoita avain paikallisesti"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "allekirjoita tai muokkaa avainta"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "muuta salasanaa"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "vie avaimia"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "vie avaimia palvelimelle"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "nouda avaimia avainpalvelimelta"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "etsi avaimia avainpalvelimelta"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "päivitä kaikki avaimet avainpalvelimelta"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "nouda/liitä avaimia"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "päivitä luottamustietokanta"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
#, fuzzy
msgid "print message digests"
msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "tuota ascii-koodattu tuloste"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NIMI|salaa vastaanottajalle NIMI"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "käytä tekstimuotoa"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "älä tee muutoksia"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "kysy ennen ylikirjoittamista"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2632,7 -2042,6 +2611,7 @@@ msgstr "
"(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
"sivuilta)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2651,13 -2060,11 +2630,13 @@@ msgstr "
" --list-keys [nimet] näytä avaimet\n"
" --fingerprint [nimet] näytä sormenjäljet\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2672,7 -2079,6 +2651,7 @@@ msgstr "
"allekirjoita, tarkista, salaa tai avaa\n"
"oletustoiminto riippuu syötteestä\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2680,606 -2086,472 +2659,601 @@@ msgstr "
"\n"
"Tuetut algoritmit:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "JulkAvain: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Salaus: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Tiiviste: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Pakkaus: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "käyttö: gpg [valitsimet] "
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "ristiriitainen komento\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "tuntematon asetus \"%s\"\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "poista avain käytöstä"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, fuzzy, c-format
#| msgid "NOTE: old default options file `%s' ignored\n"
msgid "Note: old default options file '%s' ignored\n"
msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr ""
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "Sähköpostiosoite ei kelpaa\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
#, fuzzy
msgid "invalid list options\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
#, fuzzy
msgid "invalid verify options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROITUS: %s korvaa %s:n\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s yhdessä on järjetöntä!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "valittu tiivistealgoritmi ei kelpaa\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed täytyy olla suurempi kuin 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth tulee olla välillä 1-255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr ""
"HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "virheelliset oletusarvoiset valinnat\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ja %s eivät vielä toimi yhdessä\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, fuzzy, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, fuzzy, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, fuzzy, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [tiedostonimi]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [tiedostonimi]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "avaus epäonnistui: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [tiedostonimi]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--allekirjoita [tiedostonimi]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [tiedostonimi]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [tiedostonimi]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [tiedostonimi]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key käyttäjätunnus"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key käyttäjätunnus"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key käyttäjätunnus [komennot]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key käyttäjätunnus"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "avaimen vienti epäonnistui: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "avaimen vienti epäonnistui: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ascii-koodauksen purku epäonnistui: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[tiedostonimi]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Kirjoita viestisi...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "annettu varmennekäytännön URL on virheellinen\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@@ -3324,330 -2588,264 +3298,330 @@@ msgstr "Ei ohjeita saatavilla
msgid "No help available for '%s'"
msgstr "Ei ohjetta aiheesta \"%s\""
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "päivitä luottamustietokanta"
- #: g10/import.c:143
++#: g10/import.c:147
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "päivitä luottamustietokanta"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
msgid "show key during import"
msgstr "näytä sormenjälki"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:152
++#: g10/import.c:156
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "salaista avainta ei voi käyttää"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "ohitetaan tyypin %d lohko\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "tähän mennessä käsitelty %lu avainta\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Kaikkiaan käsitelty: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " ohitetaan uudet avaimet: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ohitetaan uudet avaimet: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ilman käyttäjätunnuksia: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " tuotu: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " muuttamatonta: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " uusia käyttäjätunnuksia: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " uusia aliavaimia: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " uusia allekirjoituksia: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " uusia avainten mitätöintejä: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " luettuja salaisia avaimia: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " tuotuja salaisia avaimia: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " muuttamattomia salaisia avaimia: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " ei tuotu: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " uusia allekirjoituksia: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " luettuja salaisia avaimia: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
- #: g10/import.c:1042
++#: g10/import.c:1048
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "avain %08lX: ei käyttäjätunnusta\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "ohitetaan \"%s\": %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1264
++#: g10/import.c:1343
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr ""
"avain %08lX: käyttäjätunnus \"%s\" hyväksytty ilman omaa allekirjoitusta\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "avain %08lX: uusi avain - ohitetaan\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "avain %08lX: \"%s\" ei muutoksia\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "avain %08lX: salainen avain tuotu\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "ohitetaan: salainen avain on jo paikalla\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "salaista avainta \"%s\" ei löydy: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
@@@ -3662,142 -2860,115 +3636,142 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"avain %08lX: ei julkista avainta - mitätöintivarmennetta ei voida käyttää\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "avain %08lX: pätemätön mitätöintivarmenne: %s - hylätty\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "avain %08lX: allekirjoitukselle ei ole käyttäjätunnusta\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "avain %08lX: epäkelpo oma-allekirjoitus käyttäjätunnuksella \"%s\"\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "avain %08lX: ei aliavainta avainten mitätöintiä varten\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "avain %08lX: käyttäjätunnus ohitettu '"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "avain %08lX: aliavain ohitettu\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr ""
"avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "avain %08lX: mitätöintivarmenne väärässä paikassa - ohitetaan\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "avain %08lX: epäkelpo mitätöintivarmenne: %s - ohitetaan\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n"
"ei saatavilla.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
@@@ -4158,8 -3267,6 +4132,8 @@@ msgstr "
msgid "Really sign? (y/N) "
msgstr "Varmastiko allekirjoita? "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
@@@ -4643,14 -3648,10 +4617,14 @@@ msgstr "
"Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n"
"ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
#, fuzzy
msgid "revoked"
msgstr "[mitätöity] "
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5611,26 -4434,22 +5585,26 @@@ msgstr " Avaimen sormenjälki =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "tarkistetaan avainrengasta \"%s\"\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
msgstr[1] "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5638,7 -4457,6 +5612,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 väärä allekirjoitus\n"
msgstr[1] "1 väärä allekirjoitus\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: avainrengas luotu\n"
@@@ -5860,121 -4633,101 +5834,126 @@@ msgstr "itsenäinen mitätöinti - käy
msgid "no signature found\n"
msgstr "Allekirjoitus täsmää lähettäjään \""
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Vanhentunut allekirjoitus lähettäjältä \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Allekirjoitus täsmää lähettäjään \""
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "allekirjoituksen varmistus vaiennetaan\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "näitä allekirjoituksia ei voi käsitellä\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Allekirjoitus vanheni %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " aka \""
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr ""
"Allekirjoitus tehty %.*s käyttämällä %s-algoritmia avaintunnuksella %08lX\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ msgid " issuer \"%s\"\n"
+ msgstr " aka \""
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "Avain saatavilla kohteessa: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[ei tiedossa]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " aka \""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "Allekirjoitus vanheni %s\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "Allekirjoitus vanhenee %s\n"
# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "binääri"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "teksti"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "tuntematon "
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "tuntematon julkisen avaimen algoritmi"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "allekirjoitus ei ole erillinen\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"VAROITUS: useita allekirjoituksia havaittu. Vain ensimmäisen voi "
"tarkistaa.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
@@@ -6160,87 -4878,44 +6139,55 @@@ msgstr "VAROITUS: mahdollisesti turvato
msgid "subpacket of type %d has critical bit set\n"
msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, fuzzy, c-format
- msgid " (main key ID %s)"
- msgstr " (pääavaimen tunnus %08lX)"
-
- #: g10/passphrase.c:277
- #, fuzzy, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle:\n"
- "\"%.*s\"\n"
- "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Syötä salasana\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "käyttäjän peruma\n"
- #: g10/passphrase.c:483
++#: g10/passphrase.c:489
#, fuzzy, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "\n"
- "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
-
- #: g10/passphrase.c:491
- #, fuzzy, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr ""
+ msgid " (main key ID %s)"
+ msgstr " (pääavaimen tunnus %08lX)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Haluatko varmasti poistaa valitut avaimet? "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Haluatko varmasti poistaa valitut avaimet? "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6447,130 -5087,103 +6394,130 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "VAROITUS: Käytettyyn avaimeen ei luoteta!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr ""
"VAROITUS: tämä avain saattaa olla mitätöity (mitätöintiavainta ei "
"saatavilla)\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "VAROITUS: Tämän avaimen haltija on mitätöinyt avaimen!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Tämä voi merkitä sitä, että allekirjoitus on väärennös.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "VAROITUS: Haltija on mitätöinyt tämän aliavaimen!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Huom: Tämä avain on poistettu käytöstä\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Huom: Tämä avain on vanhentunut!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
"VAROITUS: Tätä avainta ei ole varmennettu luotettavalla allekirjoituksella!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
"haltijalleen.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "VAROITUS: Tähän avaimeen EI luoteta!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " Allekirjoitus on luultavasti VÄÄRENNÖS.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"VAROITUS: Tätä avainta ei ole varmennettu tarpeeksi luotettavalla \n"
"allekirjoituksella!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
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:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ohitettu: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s ohitettu: julkinen avain on poistettu käytöstä\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ohitettu: julkinen avain on jo olemassa\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/pkclist.c:991
++#: g10/pkclist.c:995
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/pkclist.c:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6578,37 -5191,29 +6525,37 @@@ msgstr "
"\n"
"Syötä käyttäjätunnus. Lopeta tyhjällä rivillä: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Käyttäjätunnusta ei löydy.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
msgid "skipped: public key already set as default recipient\n"
msgstr "ohitettu: julkinen avain on jo asetettu oletusvastaanottajaksi\n"
- #: g10/pkclist.c:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "Julkinen avain on poistettu käytöstä\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "ohitettu: julkinen avain on jo asetettu\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "ei kelvollisia vastaanottajia\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "avain %08lX: ei käyttäjätunnusta\n"
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "avain %08lX: ei käyttäjätunnusta\n"
@@@ -6891,7 -5444,6 +6838,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
msgstr[1] "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6967,23 -5510,19 +6914,23 @@@ msgstr "
"VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
"Käytetään laajentamatonta.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "allekirjoitetaan:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "käytetään %s-salausta\n"
@@@ -7092,7 -5611,6 +7039,7 @@@ msgstr "trustdb-tapahtuma on liian suur
msgid "%s: directory does not exist!\n"
msgstr "%s: hakemistoa ei ole olemassa!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
@@@ -7204,150 -5700,117 +7151,142 @@@ msgstr "yli %d merkkiä pitkiä tekstir
msgid "input line longer than %d characters\n"
msgstr "syöterivi on yli %d merkkiä pitkä\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Tuetut algoritmit:\n"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Käytäntö: "
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "näytä avaimet"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7357,93 -5820,78 +7296,93 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
msgid "Verified %ld messages signed by \"%s\"."
msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7454,20 -5902,16 +7393,20 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7484,8 -5928,6 +7423,7 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@@ -8026,7 -6359,6 +7964,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8082,16 -6403,13 +8020,16 @@@ msgid "
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8196,12 -6491,10 +8134,12 @@@ msgstr "
msgid "checking the CRL failed: %s"
msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr ""
@@@ -8214,7 -6505,6 +8152,7 @@@ msgstr "kirjoitan salaisen avaimen koht
msgid "intermediate certificate not yet valid"
msgstr ""
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
#, fuzzy
msgid "certificate has expired"
msgstr "Tämä avain on vanhentunut!"
@@@ -8270,7 -6549,6 +8208,7 @@@ msgstr "virheellinen varmenne
msgid " ( issuer valid from "
msgstr ""
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "näytä sormenjälki"
@@@ -8300,7 -6572,6 +8238,7 @@@ msgstr "luo mitätöintivarmenne
msgid "self-signed certificate has a BAD signature"
msgstr ""
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr ""
@@@ -8309,29 -6579,23 +8247,29 @@@
msgid "checking the trust list failed: %s\n"
msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr ""
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr ""
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "tarkista allekirjoitus"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr ""
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
#, fuzzy
msgid "certificate is good\n"
msgstr "valinta %c%lu on kopio\n"
@@@ -8364,7 -6622,6 +8302,7 @@@ msgstr "
msgid "(this is the MD2 algorithm)\n"
msgstr ""
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
#, fuzzy
msgid "none"
msgstr "ei"
@@@ -8400,36 -6652,28 +8338,36 @@@ msgstr "
"\"%.*s\"\n"
"%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr ""
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr ""
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr ""
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr ""
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr ""
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr ""
@@@ -8869,22 -7023,18 +8807,22 @@@ msgstr "
msgid "%s:%u: skipping this line\n"
msgstr " o = ohita tämä avain\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "kirjoitetaan kohteeseen \"%s\"\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8947,7 -7085,6 +8885,7 @@@ msgstr "rev? mitätöinnin tarkistukses
msgid "error storing flags: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr ""
@@@ -9066,98 -7182,73 +9004,92 @@@ msgstr "
msgid "dropping %u certificates from the cache\n"
msgstr ""
- #: dirmngr/certcache.c:352
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
- msgid "can't access directory '%s': %s\n"
- msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't parse certificate '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, fuzzy, c-format
msgid "certificate '%s' already cached\n"
msgstr "valinta %c%lu on kopio\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, fuzzy, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "Mitätöintivarmenne luotu.\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, fuzzy, c-format
msgid "certificate '%s' loaded\n"
msgstr "valinta %c%lu on kopio\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, fuzzy, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr "näytä sormenjälki"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, fuzzy, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, fuzzy, c-format
msgid "permanently loaded certificates: %u\n"
msgstr "virheellinen varmenne"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, fuzzy, c-format
msgid " runtime cached certificates: %u\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
#, fuzzy
msgid "certificate already cached\n"
msgstr "Mitätöintivarmenne luotu.\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
#, fuzzy
msgid "certificate cached\n"
msgstr "valinta %c%lu on kopio\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, fuzzy, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "virhe: sormenjälki on väärä\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, fuzzy, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, fuzzy, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
#, fuzzy
msgid "no issuer found in certificate\n"
msgstr "luo mitätöintivarmenne"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, fuzzy, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
@@@ -9419,7 -7459,6 +9351,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
@@@ -9441,7 -7477,6 +9373,7 @@@ msgstr "agentin lähettämä vastaus e
msgid "converting S-expression failed: %s\n"
msgstr "ei voi avata tiedostoa: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
@@@ -9838,116 -7793,85 +9770,112 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr ""
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
#, fuzzy
msgid "run without asking a user"
msgstr "Lopeta tallentamatta muutoksia?"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9961,91 -7885,72 +9889,91 @@@ msgstr "
"(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
"sivuilta)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "käyttö: gpg [valitsimet] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
#, 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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "rivi on liian pitkä\n"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "virhe: sormenjälki on väärä\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "lukuvirhe: %s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
#, fuzzy
msgid "shutdown forced\n"
msgstr "ei käsitelty"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10389,103 -8224,82 +10317,103 @@@ msgstr "luodun allekirjoituksen tarkist
msgid "not signed by a default OCSP signer's certificate"
msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, fuzzy, c-format
msgid "allocating list item failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, fuzzy, c-format
msgid "error getting responder ID: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr ""
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, fuzzy, c-format
msgid "issuer certificate not found: %s\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr ""
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
#, fuzzy
msgid "caller did not return the issuing certificate\n"
msgstr "luo mitätöintivarmenne"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, fuzzy, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, fuzzy, c-format
#| msgid "%s: can't access: %s\n"
msgid "can't get authorityInfoAccess: %s\n"
msgstr "%s: kohteeseen ei päästä: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
#, fuzzy
#| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr ""
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, fuzzy, c-format
#| msgid "using cipher %s\n"
msgid "using OCSP responder '%s'\n"
msgstr "käytetään salakirjoitusalgoritmia %s\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, fuzzy, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, fuzzy, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "HUOM: avain on mitätöity!"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr ""
@@@ -10533,33 -8337,27 +10461,33 @@@ msgstr "avainlohkojen poisto epäonnist
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, 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:2444
++#: dirmngr/server.c:2406
#, 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:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10584,34 -8378,24 +10512,30 @@@ msgstr "
msgid "checking CRL for"
msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
#, fuzzy
msgid "selfsigned certificate has a BAD signature"
msgstr "tarkista allekirjoitus"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, fuzzy, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
#, fuzzy
msgid "certificate chain is good\n"
msgstr "valinta %c%lu on kopio\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA vaatii 160-bittisen tiivistealgoritmin käyttöä\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "lopeta|sulje"
@@@ -10739,11 -8492,9 +10663,11 @@@ msgstr "
msgid "Options enforcing a passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
@@@ -10883,85 -8602,66 +10807,85 @@@ msgstr "
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
#, fuzzy
msgid "list global configuration file"
msgstr "tuntematon asetus \"%s\"\n"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
#, fuzzy
msgid "check global configuration file"
msgstr "tuntematon asetus \"%s\"\n"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "käytä tulostustiedostona"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
#, fuzzy
msgid "Component not found"
msgstr "julkista avainta ei löydy"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
#, fuzzy
msgid "No argument allowed"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
@@@ -11015,123 -8706,98 +10939,123 @@@ msgid "
"Call a simple symmetric encryption tool\n"
msgstr ""
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "ei voi avata tiedostoa: %s\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, fuzzy, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "tiedostoa %s ei voi avata: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
#, fuzzy
msgid "no --program option provided\n"
msgstr "etäohjelman suorittamista ei tueta\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr ""
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr ""
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "ei voida luoda kohdetta %s: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "ei voida luoda kohdetta %s: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr ""
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr ""
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
diff --cc po/fr.po
index 44e6481,eb7780b..0e09d95
--- a/po/fr.po
+++ b/po/fr.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 2.1\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2015-09-10 16:22+0200\n"
"Last-Translator: David Prévot <david at tilapin.org>\n"
"Language-Team: French <traduc at traduc.org>\n"
@@@ -114,13 -98,9 +114,13 @@@ msgstr "
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
msgid "Passphrase:"
msgstr "Phrase secrète :"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr "ne correspond pas — veuillez réessayer"
@@@ -160,64 -132,42 +160,64 @@@ msgstr "Mauvais code personnel
msgid "Bad Passphrase"
msgstr "Mauvaise phrase secrète"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "les clefs SSH plus grandes que %d bits ne sont pas prises en charge\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, c-format
msgid "can't create '%s': %s\n"
msgstr "impossible de créer « %s » : %s\n"
- #: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, c-format
msgid "can't open '%s': %s\n"
msgstr "impossible d'ouvrir « %s » : %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "erreur de lecture du numéro de série de la carte : %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "carte détectée avec le numéro de série : %s\n"
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "aucune clef d'authentification pour SSH sur la carte : %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "aucune clef de carte convenable n'a été trouvée : %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, c-format
msgid "shadowing the key failed: %s\n"
msgstr "échec de dissimulation de la clef : %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, c-format
msgid "error writing key: %s\n"
msgstr "erreur d'écriture la clef : %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -226,24 -176,19 +226,24 @@@ msgstr "
"Un processus SSH demande à utiliser la clef%%0A %s%%0A (%s)%%0AVoulez-vous "
"l'autoriser ?"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr "Autoriser"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr "Refuser"
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Veuillez entrer la phrase secrète pour la clef SSH%%0A %F%%0A (%c)"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Veuillez répéter cette phrase secrète"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -252,7 -197,6 +252,7 @@@ msgstr "
"Veuillez entrer une phrase secrète pour protéger la clef secrète%%0A %s"
"%%0A %s%%0Areçue dans l'espace de stockage de clefs de gpg-agent"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "échec de création du flux à partir de cette socket : %s\n"
@@@ -394,8 -312,6 +394,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:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -403,113 -319,82 +403,113 @@@ msgstr "
"@Options :\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr "exécuter en mode démon (arrière-plan)"
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr "exécuter en mode serveur (premier plan)"
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "bavard"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "devenir beaucoup plus silencieux"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr "sortie de commandes à la sh"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr "sortie de commandes à la csh"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FICHIER|lire les options depuis le FICHIER"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr "ne pas détacher de la console"
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr "ne pas capturer le clavier et la souris"
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "utiliser un fichier journal pour le serveur"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PROG|utiliser PROG pour entrer le code personnel"
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PROG|utiliser PROG comme SCdaemon"
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
msgid "do not use the SCdaemon"
msgstr "ne pas utiliser le SCdaemon"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, 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:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr "ignorer les demandes de modification du TTY"
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr "ignorer les demandes de modification d'aff. X"
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|oublier les codes personnels après N secondes"
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr "ne pas utiliser le cache de code pour signer"
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, 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:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr "ne pas marquer les clefs comme de confiance"
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
msgid "allow presetting passphrase"
msgstr "permettre de préconfigurer la phrase secrète"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
msgid "enable ssh support"
msgstr "activer la prise en charge de SSH"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
msgid "enable putty support"
msgstr "activer la prise en charge de putty"
@@@ -517,21 -402,14 +517,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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Veuillez signaler toutes anomalies sur <@EMAIL@> (en anglais)\n"
"et tout problème de traduction à <traduc at traduc.org>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Utilisation : dirmngr @GPG_AGENT@ (-h pour l'aide)"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -539,110 -417,75 +539,102 @@@ msgstr "
"Syntaxe : @GPG_AGENT@ [options] [commande [arguments]]\n"
"Gestionnaire de clefs secrètes pour @GNUPG@\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "niveau de débogage « %s » incorrect\n"
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr "%s est trop ancien (nécessaire : %s, utilisé : %s)\n"
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, c-format
msgid "option file '%s': %s\n"
msgstr "fichier d'options « %s » : %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, c-format
msgid "reading options from '%s'\n"
msgstr "lecture des options de « %s »\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, c-format
msgid "can't create socket: %s\n"
msgstr "impossible de créer la socket : %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, 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:1844
++#: agent/gpg-agent.c:1843
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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
msgid "error getting nonce for the socket\n"
msgstr "erreur de lecture du « nonce » de la socket\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "erreur de lien de la socket à « %s » : %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, 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:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, c-format
msgid "listen() failed: %s\n"
msgstr "échec de listen() : %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, c-format
msgid "listening on socket '%s'\n"
msgstr "écoute sur la socket « %s »\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, 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:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "répertoire « %s » créé\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "échec de stat() pour « %s » : %s\n"
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
#, 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:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erreur de lecture du « nonce » sur le descripteur %d : %s\n"
@@@ -657,28 -498,22 +649,28 @@@ msgstr "gestionnaire 0x%lx pour le desc
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "gestionnaire 0x%lx pour le descripteur %d terminé\n"
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, 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:2390
++#: agent/gpg-agent.c:2392
#, 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:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "échec de npth_pselect : %s — attente 1 s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s arrêté\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr ""
"aucune instance de gpg-agent n'est en cours d'exécution dans cette session\n"
@@@ -696,8 -529,6 +688,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:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -705,9 -536,6 +697,9 @@@ msgstr "
"@Commandes :\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -729,16 -555,13 +721,16 @@@ msgstr "
"Syntaxe : gpg-protect-tool [options] [arguments]\n"
"Outils de maintenance des clefs secrètes\n"
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Veuillez entrer la phrase secrète pour déprotéger l'objet PKCS#12."
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr ""
"Veuillez entrer la phrase secrète pour protéger le nouvel objet PKCS#12."
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
@@@ -746,7 -569,6 +738,7 @@@ msgstr "
"Veuillez entrer la phrase secrète pour protéger l'objet importé dans le "
"système GnuPG."
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -754,16 -576,13 +746,16 @@@ msgstr "
"Veuillez entrer la phrase secrète ou le code personnel\n"
"nécessaires pour terminer cette opération."
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
msgid "cancelled\n"
msgstr "annulé\n"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, c-format
msgid "error opening '%s': %s\n"
msgstr "erreur d'ouverture de « %s » : %s\n"
@@@ -942,43 -732,31 +934,43 @@@ msgid "protection hash algorithm %d (%s
msgstr ""
"l'algorithme de protection de hachage %d (%s) n'est pas pris en charge\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "erreur de création d'un tube : %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "erreur de création d'un flux pour un tube : %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, c-format
msgid "error forking process: %s\n"
msgstr "erreur de création de processus fils : %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
#| msgid "waiting for process %d to terminate failed: %s\n"
msgid "waiting for processes to terminate failed: %s\n"
msgstr "échec d'attente de fin du processus %d : %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr "erreur d'exécution de « %s » : il n'est sans doute pas installé\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "erreur d'exécution de « %s » : code de retour %d\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, c-format
msgid "error running '%s': terminated\n"
msgstr "erreur d'exécution de « %s » : terminé\n"
@@@ -993,34 -769,13 +985,16 @@@ msgstr "erreur de lecture du code de re
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "échec d'attente de fin du processus %d : %s\n"
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "impossible de se connecter à « %s » : %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "problème de communication avec gpg-agent\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
msgid "problem setting the gpg-agent options\n"
msgstr "problème de configuration des options de gpg-agent\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- msgid "canceled by user\n"
- msgstr "annulé par l'utilisateur\n"
-
- #: common/simple-pwquery.c:579
- msgid "problem with the agent\n"
- msgstr "problème avec l'agent\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- #| msgid "problem with the agent: %s\n"
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "problème avec l'agent : %s\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "impossible d'empêcher la génération de fichiers « core » : %s\n"
@@@ -1105,7 -843,6 +1079,7 @@@ msgstr "%s : %u : option « %s » o
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "Attention : « %s%s » est une option obsolète — non prise en compte\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1131,17 -864,14 +1105,17 @@@ msgstr "connexion à l'agent établie\n
msgid "connection to agent is in restricted mode\n"
msgstr "connexion à l'agent établie\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr "pas d'instance de Dirmngr en cours d'exécution — démarrage de « %s »\n"
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "attente pour permettre au dirmngr d'arriver… (%d s)\n"
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr "connexion au dirmngr établie\n"
@@@ -1399,7 -1069,6 +1373,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:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
msgid "out of core\n"
msgstr "hors limite\n"
@@@ -1457,7 -1115,10 +1431,13 @@@ msgstr "verrou « %s » non effectif�
msgid "waiting for lock %s...\n"
msgstr "attente du verrou %s…\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr "%s est trop ancien (nécessaire : %s, utilisé : %s)\n"
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "armure : %s\n"
@@@ -1697,10 -1303,6 +1677,10 @@@ msgstr "URL pour récupérer la clef pu
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Erreur : URL trop longue (limitée à %d caractères).\n"
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, c-format
msgid "error reading '%s': %s\n"
msgstr "erreur de lecture de « %s » : %s\n"
@@@ -1994,26 -1531,17 +1974,26 @@@ msgstr "Les commandes d'administration
msgid "Invalid command (try \"help\")\n"
msgstr "Commande incorrecte (essayez « help »)\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output n'est pas compatible avec cette commande\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "impossible d'ouvrir « %s »\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "clef « %s » introuvable : %s\n"
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "erreur de lecture du bloc de clef : %s\n"
@@@ -2072,36 -1588,29 +2052,36 @@@ msgid "use option \"--delete-secret-key
msgstr ""
"utiliser d'abord l'option « --delete-secret-keys » pour la supprimer.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erreur de création de la phrase secrète : %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "impossible d'utiliser un paquet ESK symétrique en mode S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "utilisation de l'algorithme de chiffrement %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, c-format
msgid "'%s' already compressed\n"
msgstr "« %s » est déjà compressé\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "Attention : « %s » est un fichier vide\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, c-format
msgid "reading from '%s'\n"
msgstr "lecture de « %s »\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2109,7 -1618,6 +2089,7 @@@ msgstr "
"Attention : forcer le chiffrement symétrique %s (%d) est en\n"
" désaccord avec les préférences du destinataire\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2118,19 -1626,16 +2098,19 @@@ msgstr "
"Attention : forcer l'algorithme de compression %s (%d) est en\n"
" désaccord avec les préférences du destinataire\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forcer le chiffrement symétrique %s (%d) est en désaccord\n"
"avec les préférences du destinataire\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s chiffré pour : « %s »\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "impossible d'utiliser %s en mode %s.\n"
@@@ -2239,8 -1723,6 +2219,8 @@@ msgstr "supprimer autant que possible d
msgid " - skipped"
msgstr " — ignoré"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, c-format
msgid "writing to '%s'\n"
msgstr "écriture de « %s »\n"
@@@ -2273,8 -1748,6 +2253,8 @@@ msgstr "erreur de création de « %s
msgid "[User ID not found]"
msgstr "[identité introuvable]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
@@@ -2348,204 -1808,155 +2328,204 @@@ msgstr "
"utilisation de la sous-clef %s à la place de la clef\n"
"principale %s\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
msgid "make a signature"
msgstr "faire une signature"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
msgid "make a clear text signature"
msgstr "faire une signature en texte clair"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "faire une signature détachée"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "chiffrer les données"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "chiffrement symétrique seulement"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "déchiffrer les données (défaut)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "vérifier une signature"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "afficher les clefs"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "afficher les clefs et les signatures"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "list and check key signatures"
msgstr "afficher et vérifier les signatures de clefs"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "afficher les clefs et les empreintes"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "afficher les clefs secrètes"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "générer une nouvelle paire de clefs"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
msgid "quickly generate a new key pair"
msgstr "générer rapidement une nouvelle paire de clefs"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly add a new user-id"
msgstr "générer rapidement une nouvelle paire de clefs"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "générer rapidement une nouvelle paire de clefs"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr "générer une paire de clefs complètes"
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "générer un certificat de révocation"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "supprimer les clefs du porte-clefs public"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "supprimer les clefs du porte-clefs secret"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
msgid "quickly sign a key"
msgstr "signer rapidement une clef"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
msgid "quickly sign a key locally"
msgstr "signer rapidement une clef localement"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "signer une clef"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "signer une clef localement"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "signer ou éditer une clef"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "modifier une phrase secrète"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "exporter les clefs"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "exporter les clefs vers un serveur de clefs"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "importer les clefs d'un serveur de clefs"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "chercher les clefs avec un serveur de clefs"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "mettre à jour les clefs depuis un serveur"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "importer ou fusionner les clefs"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr "afficher l'état de la carte"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr "modifier les données d'une carte"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr "modifier le code personnel d'une carte"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "mettre la base de confiance à jour"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
msgid "print message digests"
msgstr "indiquer les fonctions de hachage"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "exécuter en mode serveur"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "créer une sortie ASCII avec armure"
# NOTE: Extra initial space to realign the output (maybe wchar issue)
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|IDENTITÉ| chiffrer pour l'IDENTITÉ"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|IDENTITÉ| utiliser l'IDENTITÉ pour signer ou déchiffrer"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|niveau de compression N (0 désactive)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "utiliser le mode texte canonique"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FICHIER|écrire la sortie dans le FICHIER"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "ne rien modifier"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "demander avant d'écraser un fichier"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr "utiliser le comportement strict d'OpenPGP"
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2554,7 -1965,6 +2534,7 @@@ msgstr "
"(Consultez la page de manuel pour obtenir une liste complète des commandes\n"
"et options)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2574,11 -1984,9 +2554,11 @@@ msgstr "
" --list-keys [noms] montrer les clefs\n"
" --fingerprint [noms] montrer les empreintes\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Utilisation : @GPG@ [options] [fichiers] (-h pour l'aide)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2588,7 -1996,6 +2568,7 @@@ msgstr "
"Signer, vérifier, chiffrer ou déchiffrer\n"
"L'opération par défaut dépend des données entrées\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2596,86 -2003,71 +2576,86 @@@ msgstr "
"\n"
"Algorithmes pris en charge :\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "Clef publique : "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Chiffrement : "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Hachage : "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Compression : "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "utilisation : %s [options] %s\n"
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "commandes en conflit\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "aucun signe = trouvé dans la définition du groupe « %s »\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr ""
"Attention : le propriétaire du répertoire personnel « %s »\n"
" n'est pas sûr\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr ""
"Attention : le propriétaire du fichier de configuration « %s »\n"
" n'est pas sûr\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr ""
"Attention : le propriétaire de l'extension « %s »\n"
" n'est pas sûr\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr ""
"Attention : les droits du répertoire personnel « %s »\n"
" ne sont pas sûrs\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr ""
"Attention : les droits du fichier de configuration « %s »\n"
" ne sont pas sûrs\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr ""
"Attention : les droits de l'extension « %s »\n"
" ne sont pas sûrs\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"Attention : le propriétaire du répertoire contenant le répertoire personnel\n"
" « %s » n'est pas sûr\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2683,21 -2075,18 +2663,21 @@@ msgstr "
"Attention : le propriétaire du répertoire contenant le fichier de\n"
" configuration « %s » n'est pas sûr\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"Attention : le propriétaire du répertoire contenant l'extension\n"
" « %s » n'est pas sûr\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"Attention : les droits du répertoire contenant le répertoire personnel\n"
" « %s » ne sont pas sûrs\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2705,508 -2094,392 +2685,503 @@@ msgstr "
"Attention : les droits du répertoire contenant le fichier de configuration\n"
" « %s » ne sont pas sûrs\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"Attention : les droits du répertoire contenant l'extension\n"
" « %s » ne sont pas sûrs\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "élément de configuration « %s » inconnu\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr "montrer les photos d'identité en affichant les clefs"
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
msgid "show key usage information during key listings"
msgstr "indiquer les informations sur l'utilisation en affichant les clefs"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr "montrer les URL de politique en affichant les signatures"
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
msgid "show all notations during signature listings"
msgstr "montrer toutes les notations en affichant les signatures"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr "utiliser les notations aux normes IETF en affichant les signatures"
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr ""
"utiliser les notations fournies par l'utilisateur en affichant les signatures"
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"montrer les URL des serveurs de clefs favoris en affichant les signatures"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr "indiquer la validité de l'identité en affichant les clefs"
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr "montrer les identités révoquées et expirées en affichant les clefs"
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr "indiquer les sous-clefs révoquées et expirées en affichant les clefs"
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
msgid "show the keyring name in key listings"
msgstr "montrer le nom du porte-clefs en affichant les clefs"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
msgid "show expiration dates during signature listings"
msgstr "montrer les dates d'expiration en affichant les signatures"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "Clefs disponibles :\n"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
#| msgid "unknown option '%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "option « %s » inconnue\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- #| msgid "unknown command '%s'\n"
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "commande « %s » inconnue\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "Remarque : l'ancien fichier d'options par défaut « %s » a été ignoré\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr "libgcrypt est trop ancienne (nécessaire : %s, utilisé : %s)\n"
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "Remarque : %s n'est pas pour une utilisation normale.\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "« %s » n'est pas une date d'expiration de signature valable\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ #| msgid "line %d: not a valid email address\n"
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "ligne %d : ce n'est pas une adresse électronique valable\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "mode pinentry « %s » incorrect\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "« %s » n'est pas un jeu de caractères valable\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "impossible d'analyser l'URL du serveur de clefs\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s : %d : les options du serveur de clefs sont incorrectes\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
msgid "invalid keyserver options\n"
msgstr "les options du serveur de clefs sont incorrectes\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s : %d : options d'importation incorrectes\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "options d'importation incorrectes\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "options de liste incorrectes\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s : %d : options d'exportation incorrectes\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "options d'exportation incorrectes\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s : %d : options de liste incorrectes\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
msgid "invalid list options\n"
msgstr "options de liste incorrectes\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr "montrer les photos d'identité en vérifiant les signatures"
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr "montrer les URL de politique en vérifiant les signatures"
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
msgid "show all notations during signature verification"
msgstr "montrer toutes les notations en vérifiant les signatures"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr "utiliser les notations aux normes IETF en vérifiant les signatures"
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr ""
"utiliser les notations fournies par l'utilisateur en vérifiant les signatures"
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"montrer les URL des serveurs de clefs favoris en vérifiant les signatures"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
msgid "show user ID validity during signature verification"
msgstr "indiquer la validité de l'identité en vérifiant les signatures"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"montrer les identités révoquées et expirées en vérifiant les signatures"
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
msgid "show only the primary user ID in signature verification"
msgstr "ne montrer que l'identité principale en vérifiant les signatures"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr "valider les signatures avec les données PKA"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr "augmenter la confiance des signatures avec des données PKA valables"
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s : %d : options de vérification incorrectes\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
msgid "invalid verify options\n"
msgstr "options de vérification incorrectes\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "impossible de configurer le chemin d'exécution à %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s : %d : liste de recherche automatique de clef incorrecte\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr "liste de recherche automatique de clef incorrecte\n"
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "Attention : le programme pourrait créer un fichier « core ».\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "Attention : %s remplace %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n'est pas permis avec %s.\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n'a aucun sens avec %s.\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr "Attention : exécution avec un système de temps contrefait : "
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "ne sera pas exécuté avec une mémoire non sécurisée à cause de %s\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorithme de chiffrement sélectionné est incorrect\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "la fonction de hachage sélectionnée est incorrecte\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorithme de compression sélectionné est incorrect\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "la fonction de hachage de certification sélectionnée est incorrecte\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "« completes-needed » doit être supérieur à 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "« marginals-needed » doit être supérieur à 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "« max-cert-depth » doit être compris entre 1 et 255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "« default-cert-level » incorrect ; doit être 0, 1, 2 ou 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "« min-cert-level » incorrect ; doit être , 1, 2 ou 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Remarque : le mode S2K simple (0) est fortement déconseillé\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mode S2K incorrect ; doit être 0, 1 ou 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "préférences par défaut incorrectes\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "préférences personnelles de chiffrement incorrectes\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "préférences personnelles de hachage incorrectes\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "préférences personnelles de compression incorrectes\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne fonctionne pas encore avec %s\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "impossible d'utiliser l'algorithme de chiffrement « %s » en mode %s.\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "impossible d'utiliser l'algorithme de hachage « %s » en mode %s.\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "impossible d'utiliser l'algorithme de compression « %s » en mode %s.\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "impossible d'initialiser la base de confiance : %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"Attention : les destinataires (-r) indiqués n'utilisent pas\n"
" de clef publique pour le chiffrement\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [fichier]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [fichier]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "échec du chiffrement symétrique de « %s » : %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [fichier]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [fichier]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "impossible d'utiliser --symmetric --encrypt avec --s2k-mode 0\n"
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "impossible d'utiliser --symmetric --encrypt en mode %s\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [fichier]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [fichier]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [fichier]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "impossible d'utiliser --symmetric --sign --encrypt avec --s2k-mode 0\n"
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "impossible d'utiliser --symmetric --sign --encrypt en mode %s\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [fichier]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [fichier]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [fichier]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key identité"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key identité"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key identité [commandes]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
msgid "--passwd <user-id>"
msgstr "--passwd <identité>"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "échec d'envoi vers le serveur de clefs : %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "échec de réception depuis le serveur de clefs : %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "échec d'exportation de la clef : %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "échec d'exportation de la clef : %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "échec de recherche au sein du serveur de clefs : %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "échec de rafraîchissement par le serveur de clefs : %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "échec de déconstruction d'une armure : %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "échec de construction d'une armure : %s \n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "algorithme de hachage « %s » incorrect\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
#| msgid "error loading certificate '%s': %s\n"
msgid "error parsing key specification '%s': %s\n"
msgstr "erreur de chargement du certificat « %s » : %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[fichier]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Vous pouvez taper votre message…\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL de politique de certification donnée est incorrecte\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL de politique de signature donnée est incorrecte\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
msgid "the given preferred keyserver URL is invalid\n"
msgstr "l'URL du serveur de clefs favori qui a été donnée est incorrecte\n"
@@@ -3247,138 -2512,110 +3222,138 @@@ msgstr "Pas d'aide disponible
msgid "No help available for '%s'"
msgstr "Pas d'aide disponible pour « %s »"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr "importer des signatures marquées comme locales seulement"
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr "réparer les données endommagées du serveur pks pendant l'importation"
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "ne pas mettre à jour la base de confiance après l'importation"
- #: g10/import.c:143
++#: g10/import.c:147
msgid "do not update the trustdb after import"
msgstr "ne pas mettre à jour la base de confiance après l'importation"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "afficher l'empreinte de la clef"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr "n'accepter que les mises à jour des clefs existantes"
- #: g10/import.c:152
++#: g10/import.c:156
msgid "remove unusable parts from key after import"
msgstr "nettoyer les parties inutilisables de la clef après l'importation"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr "supprimer autant que possible de la clef après l'importation"
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "un bloc de type %d a été ignoré\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu clefs traitées jusqu'à présent\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Quantité totale traitée : %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " nouvelles clefs ignorées : %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " nouvelles clefs ignorées : %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sans identité : %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importées : %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " non modifiées : %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nouvelles identités : %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nouvelles sous-clefs : %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " nouvelles signatures : %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr "nouvelles révocations de clef : %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " clefs secrètes lues : %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " clefs secrètes importées : %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " clefs secrètes non modifiées : %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " non importées : %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signatures nettoyées : %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " identités nettoyées : %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3387,189 -2624,151 +3362,189 @@@ msgstr "
"Attention : la clef %s contient des préférences pour des\n"
" algorithmes indisponibles pour ces identités :\n"
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " « %s » : préférence pour l'algorithme de chiffrement %s\n"
- #: g10/import.c:1042
++#: g10/import.c:1048
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " « %s » : préférence pour l'algorithme de hachage %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " « %s » : préférence pour l'algorithme de compression %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "vous devriez mettre à jour vos préférences et redistribuer cette\n"
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "clef pour éviter d'éventuels problèmes d'algorithmes non appropriés\n"
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"vous pouvez mettre à jour vos préférences avec :\n"
"gpg --edit-key %s updpref save\n"
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, c-format
msgid "key %s: no user ID\n"
msgstr "clef %s : pas d'identité\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, c-format
msgid "key %s: %s\n"
msgstr "clef %s : %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr "rejetée par le filtre d’importation"
- #: g10/import.c:1264
++#: g10/import.c:1343
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "clef %s : corruption de sous-clef PKS réparée\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "clef %s : identité « %s » non autosignée acceptée\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "clef %s : pas d'identité valable\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "cela pourrait provenir d'une autosignature manquante\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "clef %s : clef publique introuvable : %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "clef %s : nouvelle clef — ignorée\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "aucun porte-clefs accessible en écriture n'a été trouvé : %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "erreur d'écriture du porte-clefs « %s » : %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "clef %s : clef publique « %s » importée\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "clef %s : ne correspond pas à notre copie\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "clef %s : impossible de trouver le bloc de clef d'origine : %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "clef %s : impossible de lire le bloc de clef d'origine : %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "clef %s : « %s » 1 nouvelle identité\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "clef %s : « %s » %d nouvelles identités\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "clef %s : « %s » 1 nouvelle signature\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "clef %s : « %s » %d nouvelles signatures\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "clef %s : « %s » 1 nouvelle sous-clef\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "clef %s : « %s » %d nouvelles sous-clefs\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "clef %s : « %s » %d signature nettoyée\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "clef %s : « %s » %d signatures nettoyées\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "clef %s : « %s » %d identité nettoyée\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "clef %s : « %s » %d identités nettoyées\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "clef %s : « %s » n'est pas modifiée\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, c-format
msgid "key %s: secret key imported\n"
msgstr "clef %s : clef secrète importée\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "clef %s : la clef secrète clef existe déjà\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "clef %s : erreur d'envoi à l'agent : %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, c-format
msgid "secret key %s: %s\n"
msgstr "clef secrète %s : %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
msgid "importing secret keys not allowed\n"
msgstr "impossible d'importer des clefs secrètes\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "clef %s : clef secrète avec chiffrement %d incorrect — ignorée\n"
@@@ -3584,143 -2783,116 +3559,143 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"clef %s : pas de clef publique — impossible d'appliquer le certificat\n"
" de révocation\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "clef %s : certificat de révocation incorrect : %s — rejeté\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "clef %s : « %s » certificat de révocation importé\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "clef %s : pas d'identité pour la signature\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "clef %s : algorithme à clef publique non géré avec l'identité « %s »\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "clef %s : autosignature de l'identité « %s » incorrecte\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "clef %s : algorithme à clef publique non pris en charge\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "clef %s : signature directe de clef incorrecte\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "clef %s : pas de sous-clef pour relier la clef\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "clef %s : lien à la sous-clef incorrect\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "clef %s : suppression de lien multiple aux sous-clefs\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "clef %s : pas de sous-clef pour révoquer la clef\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "clef %s : révocation de sous-clef incorrecte\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "clef %s : suppression de la révocation de sous-clefs multiples\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clef %s : identité « %s » ignorée\n"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "clef %s : sous-clef ignorée\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "clef %s : signature non exportable (classe 0x%02X) — ignorée\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "clef %s : certificat de révocation au mauvais endroit — ignoré\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "clef %s : certificat de révocation incorrect : %s — ignoré\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "clef %s : signature de sous-clef au mauvais endroit — ignorée\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "clef %s : classe de signature inattendue (0x%02X) — ignorée\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "clef %s : identités en double détectées — fusionnées\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"Attention : la clef %s est peut-être révoquée :\n"
" récupération de la clef de révocation %s\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"Attention : la clef %s est peut-être révoquée :\n"
" la clef de révocation %s est absente.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "clef %s : ajout du certificat de révocation « %s »\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "clef %s : ajout de la signature directe de clef\n"
@@@ -4060,8 -3170,6 +4035,8 @@@ msgstr "J'ai complètement vérifié ce
msgid "Really sign? (y/N) "
msgstr "Voulez-vous vraiment signer ? (o/N) "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "échec de la signature : %s\n"
@@@ -4522,13 -3528,9 +4497,13 @@@ msgstr "
"Veuillez remarquer que la validité affichée pour la clef n'est pas\n"
"forcément correcte avant d'avoir relancé le programme.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
msgid "revoked"
msgstr "révoquée"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "expirée"
@@@ -5481,12 -4305,10 +5456,12 @@@ msgstr " Empreinte de la clef =
msgid " Card serial no. ="
msgstr " Nº de série de carte ="
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, c-format
msgid "caching keyring '%s'\n"
msgstr "mise en cache du porte-clefs « %s »\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5494,7 -4316,6 +5469,7 @@@ msgid_plural "%lu keys cached so far (%
msgstr[0] "%lu clefs mises en cache pour l'instant (%lu signatures)\n"
msgstr[1] "%lu clefs mises en cache pour l'instant (%lu signatures)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, fuzzy, c-format
#| msgid "flush the cache"
msgid "%lu key cached"
@@@ -5502,7 -4323,6 +5477,7 @@@ msgid_plural "%lu keys cached
msgstr[0] "vider le cache"
msgstr[1] "vider le cache"
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5510,7 -4330,6 +5485,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 mauvaise signature\n"
msgstr[1] "1 mauvaise signature\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s : porte-clefs créé\n"
@@@ -5732,115 -4506,96 +5707,121 @@@ msgstr "révocation autonome — utili
msgid "no signature found\n"
msgstr "aucune signature trouvée\n"
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, c-format
msgid "BAD signature from \"%s\""
msgstr "MAUVAISE signature de « %s »"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Signature expirée de « %s »"
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, c-format
msgid "Good signature from \"%s\""
msgstr "Bonne signature de « %s »"
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "vérification de signature supprimée\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
msgid "can't handle this ambiguous signature data\n"
msgstr "impossible de traiter ces données ambiguës de signature\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, c-format
msgid "Signature made %s\n"
msgstr "Signature faite le %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, c-format
msgid " using %s key %s\n"
msgstr " avec la clef %s %s\n"
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Signature faite le %s avec la clef %s d'identifiant %s\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ #| msgid " aka \"%s\""
+ msgid " issuer \"%s\"\n"
+ msgstr " alias « %s »"
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "Clef disponible sur : "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[doute]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, c-format
msgid " aka \"%s\""
msgstr " alias « %s »"
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "La signature a expiré le %s\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "La signature expire le %s\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "signature %s, algorithme de hachage %s%s%s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "binaire"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "mode texte"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "inconnu"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
msgid ", key algorithm "
msgstr ", algorithme de clef "
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossible de vérifier la signature : %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "la signature n'est pas détachée\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"Attention : plusieurs signatures ont été détectées.\n"
" Seule la première sera vérifiée.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "signature autonome de classe 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "signature d'un ancien type (PGP 2.x)\n"
@@@ -6028,94 -4748,48 +6009,59 @@@ msgstr "
msgid "subpacket of type %d has critical bit set\n"
msgstr "un sous-paquet de type %d possède un bit critique\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, c-format
msgid "problem with the agent: %s\n"
msgstr "problème avec l'agent : %s\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, c-format
- msgid " (main key ID %s)"
- msgstr " (identifiant de clef principale %s)"
-
- #: g10/passphrase.c:277
- #, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Veuillez entrer la phrase secrète pour déverrouiller la clef secrète pour "
- "le\n"
- "certificat OpenPGP :\n"
- "« %2$.*1$s »\n"
- "clef %4$s de %3$u bits, identifiant %5$s,\n"
- "créée le %6$s%7$s.\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Entrez la phrase secrète\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "annulé par l'utilisateur\n"
- #: g10/passphrase.c:483
++#: g10/passphrase.c:489
#, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "Une phrase secrète est nécessaire pour déverrouiller la clef secrète de\n"
- "l'utilisateur : « %s »\n"
-
- #: g10/passphrase.c:491
- #, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "clef %2$s de %1$u bits, identifiant %3$s, créée le %4$s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr " (sous-clef de la clef principale d'identifiant %s)"
+ msgid " (main key ID %s)"
+ msgstr " (identifiant de clef principale %s)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr ""
"Veuillez entrer la phrase secrète pour déverrouiller la clef secrète "
"OpenPGP :"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr ""
"Veuillez entrer la phrase secrète pour importer la clef secrète OpenPGP :"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr ""
"Veuillez entrer la phrase secrète pour exporter la sous-clef secrète "
"OpenPGP :"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr ""
"Veuillez entrer la phrase secrète pour exporter la clef secrète OpenPGP :"
# NOTE: s/subkey key/subkey/
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr ""
"Voulez-vous vraiment supprimer de façon permanente la sous-clef secrète "
"OpenPGP :"
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr ""
"Voulez-vous vraiment supprimer de façon permanente la clef secrète OpenPGP :"
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, c-format
msgid ""
"%s\n"
@@@ -6319,132 -4958,105 +6265,132 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "Faut-il quand même utiliser cette clef ? (o/N) "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "Attention : utilisation d'une clef sans confiance.\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr ""
"Attention : cette clef est peut-être révoquée (clef de révocation absente)\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "Attention : cette clef a été révoquée par son révocateur désigné.\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "Attention : cette clef à été révoquée par son propriétaire.\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
msgid " This could mean that the signature is forged.\n"
msgstr ""
" Cela pourrait signifier que la signature est contrefaite.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "Attention : cette sous-clef à été révoquée par son propriétaire.\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Remarque : cette clef a été désactivée.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Remarque : l'adresse vérifiée du signataire est « %s »\n"
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
"Remarque : l'adresse du signataire « %s » ne correspond pas à l'entrée DNS\n"
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "confiance ajustée à TOTALE car les renseignements PKA sont conformes\n"
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "confiance ajustée à JAMAIS à cause de mauvais renseignements PKA\n"
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Remarque : cette clef a expiré.\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
"Attention : cette clef n'est pas certifiée avec une signature de confiance.\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Rien n'indique que la signature appartient à son propriétaire.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "Attention : nous n'avons PAS confiance en cette clef.\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " La signature est sans doute CONTREFAITE.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"Attention : cette clef n'a pas suffisamment de signatures de confiance.\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr ""
" Aucune certitude que la signature appartienne à son "
"propriétaire.\n"
- #: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s : ignoré : %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s : ignoré : la clef publique est désactivée\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s : ignoré : clef publique déjà présente\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, 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:991
++#: g10/pkclist.c:995
#, 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:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr "Destinataires actuels :\n"
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6452,38 -5064,30 +6398,38 @@@ msgstr "
"\n"
"Entrez l'identité, en terminant par une ligne vide : "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Cette identité n'existe pas.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
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:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "La clef publique est désactivée.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "ignoré : clef publique déjà activée\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinataire par défaut « %s » inconnu\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "pas de destinataire valable\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, 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:1649
++#: g10/pkclist.c:1653
#, 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"
@@@ -6794,7 -5346,6 +6740,7 @@@ msgstr[0] "
msgstr[1] ""
"la clef publique %s est plus récente de %lu seconde que la signature\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6878,12 -5420,10 +6824,12 @@@ msgstr "
" l'URL du serveur de clef favori (chaîne trop grande).\n"
" Utilisation de la version non expansée.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s signature de : « %s »\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6891,11 -5431,9 +6837,11 @@@ msgstr "
"Attention : forcer l'algorithme de hachage %s (%d) est en\n"
" désaccord avec les préférences du destinataire\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "signature :"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "le chiffrement %s sera utilisé\n"
@@@ -7001,7 -5519,6 +6947,7 @@@ msgstr "transaction de base de confianc
msgid "%s: directory does not exist!\n"
msgstr "%s : le répertoire n'existe pas.\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, c-format
msgid "can't access '%s': %s\n"
msgstr "impossible d'accéder à « %s » : %s\n"
@@@ -7110,134 -5605,104 +7056,126 @@@ msgstr "impossible de traiter les ligne
msgid "input line longer than %d characters\n"
msgstr "la ligne d'entrée est plus longue que %d caractères\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "erreur d'envoi d'options standards : %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "algorithme non pris en charge : %s"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "erreur d'envoi de données : %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing base64 encoding: %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "erreur d'écriture en encodage base64 : %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "error initializing reader object: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "erreur d'initialisation de l'objet lecteur : %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
#| msgid "error opening '%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "erreur d'ouverture de « %s » : %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "erreur d'envoi de données : %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
#| msgid "error getting responder ID: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "erreur de lecture de l'identifiant de répondeur : %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "validité : %s"
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "erreur de lecture des options stockées : %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "afficher les clefs"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%ld message signed"
@@@ -7245,21 -5710,18 +7183,21 @@@ msgid_plural "%ld messages signed
msgstr[0] "indiquer les fonctions de hachage"
msgstr[1] "indiquer les fonctions de hachage"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7269,28 -5731,23 +7207,28 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
#| msgid "error setting OCSP target: %s\n"
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "erreur de configuration de la cible OCSP : %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
@@@ -7298,67 -5755,57 +7236,67 @@@ msgstr "erreur de création d'un tube
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %ld messages signed by \"%s\"."
msgstr "indiquer les fonctions de hachage"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7369,20 -5816,16 +7307,20 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7399,8 -5842,6 +7337,7 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error opening TOFU database: %s\n"
@@@ -7969,7 -6301,6 +7906,7 @@@ msgstr "|N|Nouveau code personnel initi
msgid "run in multi server mode (foreground)"
msgstr "exécuter en mode multiserveur (premier plan)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NIVEAU|définir le niveau de débogage à NIVEAU"
@@@ -8021,18 -6341,15 +7958,18 @@@ msgstr "
"Syntaxe : scdaemon [options] [commande [arguments]]\n"
"Démon de carte à puce pour @GNUPG@\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
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:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr "gestionnaire pour le descripteur %d démarré\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "gestionnaire pour le descripteur %d terminé\n"
@@@ -8135,12 -6429,10 +8072,12 @@@ msgstr "veuillez vous assurer que le «
msgid "checking the CRL failed: %s"
msgstr "échec de vérification de la liste de révocations de certificat : %s"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr "certificat avec validité incorrecte : %s"
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr "certificat pas encore valable"
@@@ -8152,7 -6442,6 +8089,7 @@@ msgstr "certificat racine pas encore va
msgid "intermediate certificate not yet valid"
msgstr "certificat intermédiaire pas encore valable"
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
msgid "certificate has expired"
msgstr "le certificat a expiré"
@@@ -8202,7 -6480,6 +8139,7 @@@ msgstr " (certificat valable depuis
msgid " ( issuer valid from "
msgstr " ( émetteur valable depuis "
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, c-format
msgid "fingerprint=%s\n"
msgstr "empreinte=%s\n"
@@@ -8233,7 -6504,6 +8170,7 @@@ msgstr "aucun émetteur trouvé dans l
msgid "self-signed certificate has a BAD signature"
msgstr "certificat autosigné avec une mauvaise signature"
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr "le certificat racine n'est pas marqué de confiance"
@@@ -8242,32 -6511,26 +8179,32 @@@
msgid "checking the trust list failed: %s\n"
msgstr "échec de vérification de la liste de confiance : %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr "chaîne de certificats trop longue\n"
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr "certificat d'émetteur introuvable"
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
msgid "certificate has a BAD signature"
msgstr "certificat avec une mauvaise signature"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr ""
"un autre certificat d'autorité de certification pouvant correspondre a été "
"trouvé — nouvel essai"
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
"chaîne de certificats plus longue que celle autorisée par l'autorité de "
"certification (%d)"
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
msgid "certificate is good\n"
msgstr "le certificat est correct\n"
@@@ -8298,7 -6555,6 +8235,7 @@@ msgstr "
msgid "(this is the MD2 algorithm)\n"
msgstr "(c'est l'algorithme MD2)\n"
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
msgid "none"
msgstr "aucun"
@@@ -8334,40 -6585,32 +8271,40 @@@ msgstr "
"numéro de série %s, identifiant 0x%08lX,\n"
"créé le %s, expire le %s.\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr ""
"aucune utilisation de clef indiquée — toutes les utilisations sont "
"supposées\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "erreur de lecture des renseignements d'utilisation de clef : %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr "le certificat n'aurait pas dû être utilisé pour la certification\n"
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr ""
"le certificat n'aurait pas dû être utilisé pour la signature de réponse "
"OCSP\n"
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr "le certificat n'aurait pas dû être utilisé pour le chiffrement\n"
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr "le certificat n'aurait pas dû être utilisé pour la signature\n"
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr "le certificat n'est pas utilisable pour le chiffrement\n"
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr "le certificat n'est pas utilisable pour la signature\n"
@@@ -8788,21 -6941,17 +8725,21 @@@ msgstr "%s : %u : mot de passe donn�
msgid "%s:%u: skipping this line\n"
msgstr "%s : %u : ignorer cette ligne\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
msgid "could not parse keyserver\n"
msgstr "impossible d'analyser le serveur de clefs\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "importation des certificats commun « %s »\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "impossible de signer en utilisant « %s » : %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr "commande incorrecte (il n'y a pas de commande implicite)\n"
@@@ -8863,7 -7000,6 +8800,7 @@@ msgstr "problème de nouvelle recherch
msgid "error storing flags: %s\n"
msgstr "erreur de stockage des options : %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr "Erreur — "
@@@ -8997,93 -7112,69 +8934,88 @@@ msgstr "impossible de libérer le verro
msgid "dropping %u certificates from the cache\n"
msgstr "abandon de %u certificats du cache\n"
- #: dirmngr/certcache.c:352
- #, c-format
- msgid "can't access directory '%s': %s\n"
- msgstr "impossible d'accéder au répertoire « %s » : %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, c-format
msgid "can't parse certificate '%s': %s\n"
msgstr "impossible d'analyser le certificat « %s » : %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, c-format
msgid "certificate '%s' already cached\n"
msgstr "certificat « %s » déjà en cache\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "certificat de confiance « %s » chargé\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, c-format
msgid "certificate '%s' loaded\n"
msgstr "certificat « %s » chargé\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr " empreinte SHA1 = %s\n"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr " émetteur ="
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr " sujet ="
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "erreur de chargement du certificat « %s » : %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, c-format
msgid "permanently loaded certificates: %u\n"
msgstr "certificats chargés de façon permanente : %u\n"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, c-format
msgid " runtime cached certificates: %u\n"
msgstr " certificats actuellement en cache : %u\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
msgid "certificate already cached\n"
msgstr "certificat déjà en cache\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
msgid "certificate cached\n"
msgstr "certificat en cache\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, c-format
msgid "error caching certificate: %s\n"
msgstr "erreur de mise en cache du certificat : %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "chaîne « %s » d'empreinte SHA1 incorrecte\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "erreur de récupération du certificat par numéro de série : %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "erreur de récupération du certificat par sujet : %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
msgid "no issuer found in certificate\n"
msgstr "aucun émetteur trouvé dans le certificat\n"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "erreur de lecture d'authorityKeyIdentifier : %s\n"
@@@ -9358,7 -7398,6 +9290,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "erreur de lecture des données du fichier de cache : %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, c-format
msgid "unknown hash algorithm '%s'\n"
msgstr "algorithme de hachage « %s » inconnu\n"
@@@ -9377,7 -7413,6 +9309,7 @@@ msgstr "expression symbolique incorrect
msgid "converting S-expression failed: %s\n"
msgstr "échec de conversion d'expression symbolique : %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, c-format
msgid "creating S-expression failed: %s\n"
msgstr "échec de création d'expression symbolique : %s\n"
@@@ -9791,120 -7746,89 +9723,116 @@@ msgstr "nom de fichier absolu attendu\n
msgid "looking up '%s'\n"
msgstr "recherche de « %s »\n"
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr "exécuter en service Windows (arrière-plan)"
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
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:162
++#: dirmngr/dirmngr.c:149
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:163
++#: dirmngr/dirmngr.c:150
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:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr "arrêter le dirmngr"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr "vider le cache"
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr "|FICHIER|écrire les journaux serveur dans le FICHIER"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
msgid "run without asking a user"
msgstr "exécuter sans demander à l'utilisateur"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr "forcer le chargement des listes de révocations de certificat obsolètes"
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr "permettre l'envoi de requêtes OCSP"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr "interdire l'utilisation d'HTTP"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr "interdire l'utilisation de LDAP"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
"ignorer les points de distribution de liste de révocations de certificat en "
"HTTP"
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
"ignorer les points de distribution de liste de révocations de certificat en "
"LDAP"
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr "ignorer les URL de service OCSP contenues dans le certificat"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|rediriger toutes les requêtes HTTP vers l'URL"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HÔTE|utiliser l'HÔTE pour les requêtes LDAP"
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "ne pas utiliser d'hôtes de repli avec --ldap-proxy"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FICHIER|lire la liste de serveurs LDAP depuis le FICHIER"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
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:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 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:209
++#: dirmngr/dirmngr.c:196
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|utiliser le répondeur OCSP à l'URL"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr "|EMPR|réponse OCSP signée par EMPR"
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
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:222
++#: dirmngr/dirmngr.c:209
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:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9914,11 -7838,9 +9842,11 @@@ msgstr "
"(Consultez le manuel « info » pour obtenir une liste complète des commandes\n"
"et options)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Utilisation : @DIRMNGR@ [options] (-h pour l'aide)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9927,79 -7849,62 +9855,79 @@@ msgstr "
"Serveur de clefs, liste de révocations de certificat et accès OCSP pour "
"@GNUPG@\n"
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "les niveaux de débogage possibles sont : %s\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, c-format
msgid "usage: %s [options] "
msgstr "utilisation : %s [options] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, 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:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, 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:1594
++#: dirmngr/dirmngr.c:1418
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s : %u : ligne trop longue — ignorée\n"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s : %u : empreinte incorrecte détectée\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s : %u : erreur de lecture : %s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, 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:1807
++#: dirmngr/dirmngr.c:1631
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:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr "SIGUSR2 reçu — aucune action définie\n"
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr "SIGTERM reçu — arrêt…\n"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "SIGTERM reçu — encore %d connexions actives\n"
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
msgid "shutdown forced\n"
msgstr "arrêt forcé\n"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr "SIGINT reçu — arrêt immédiat\n"
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "signal %d reçu — aucune action définie\n"
@@@ -10332,99 -8167,78 +10260,99 @@@ msgstr "échec de hachage de la répons
msgid "not signed by a default OCSP signer's certificate"
msgstr "non signée par un certificat de signataire OCSP par défaut"
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr "seul SHA-1 est pris en charge pour les réponses\n"
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, c-format
msgid "allocating list item failed: %s\n"
msgstr "erreur d'allocation d'élément de liste : %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, c-format
msgid "error getting responder ID: %s\n"
msgstr "erreur de lecture de l'identifiant de répondeur : %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr ""
"aucun certificat convenable n'a été trouvée pour vérifier la réponse OCSP\n"
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, c-format
msgid "issuer certificate not found: %s\n"
msgstr "certificat d'émetteur introuvable : %s\n"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr "l'appelant n'a pas renvoyé le certificat cible\n"
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
msgid "caller did not return the issuing certificate\n"
msgstr "l'appelant n'a pas renvoyé le certificat émetteur\n"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "échec d'allocation du contexte OCSP : %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, c-format
msgid "can't get authorityInfoAccess: %s\n"
msgstr "impossible d'obtenir authorityInfoAccess : %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr "aucun répondeur OCSP par défaut défini\n"
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
msgid "no default OCSP signer defined\n"
msgstr "aucun signataire OCSP par défaut défini\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr "utilisation du répondeur OCSP « %s » par défaut\n"
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, c-format
msgid "using OCSP responder '%s'\n"
msgstr "utilisation du répondeur OCSP « %s »\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr "échec d'établissement d'un contexte de hachage pour OCSP : %s\n"
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "erreur de lecture de l'état OCSP pour le certificat cible : %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr "l'état du certificat est : %s (celui-ci=%s prochain=%s)\n"
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr "correct"
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "le certificat a été révoquée le : %s à cause de : %s\n"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr "le répondeur OCSP a renvoyé un état dans le futur\n"
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr "le répondeur OCSP a renvoyé un état non actuel\n"
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr "le répondeur OCSP a renvoyé un trop vieil état\n"
@@@ -10472,32 -8276,26 +10400,32 @@@ msgstr "échec de fetch_next_cert : %s
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d dépassé\n"
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "impossible d'allouer une structure de contrôle : %s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "échec d'allocation du contexte Assuan : %s\n"
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "impossible d'initialiser le serveur : %s\n"
- #: dirmngr/server.c:2444
++#: dirmngr/server.c:2406
#, 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:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "problème d'accept_assuan : %s\n"
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "problème de traitement Assuan : %s\n"
@@@ -10522,36 -8316,25 +10450,31 @@@ msgstr "pas de vérification de liste d
msgid "checking CRL for"
msgstr "vérification de liste de révocations de certificat pour"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
- "exécution en mode de compatibilité — chaîne de certificats non vérifiée\n"
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
msgid "selfsigned certificate has a BAD signature"
msgstr "certificat autosigné avec une mauvaise signature"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr ""
"échec de vérification du niveau de confiance du certificat racine : %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
msgid "certificate chain is good\n"
msgstr "la chaîne de certificats est correcte\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA nécessite l'utilisation d'un algorithme de hachage de 160 bits\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
"le certificat n'aurait pas dû être utilisé pour signer une liste de "
"révocations de certificat\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
msgid "quiet"
msgstr "silencieux"
@@@ -10677,11 -8429,9 +10600,11 @@@ msgstr "|N|définir la durée maximale
msgid "Options enforcing a passphrase policy"
msgstr "Options d'application d'une politique de phrase secrète"
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr "pas de contournement de politique de phrase secrète"
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|définir la taille minimale des nouvelles phrases secrètes à N"
@@@ -10822,67 -8540,51 +10745,67 @@@ msgstr "Échec de vérification extern
msgid "Note that group specifications are ignored\n"
msgstr "Remarquez que les spécifications de groupe sont ignorées\n"
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr "afficher tous les composants"
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr "vérifier tous les programmes"
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr "|COMPOSANT|afficher les options"
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr "|COMPOSANT|modifier les options"
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr "|COMPOSANT|vérifier les options"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr "appliquer les valeurs par défaut globales"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr "aff. répertoires de configuration pour @GPGCONF@"
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
msgid "list global configuration file"
msgstr "afficher le fichier de configuration globale"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
msgid "check global configuration file"
msgstr "vérifier le fichier de configuration globale"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr "recharger tous les composants ou celui donné"
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr "lancer un composant donné"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr "tuer un composant donné"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "utiliser comme fichier de sortie"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr "activer modif. pendant l'exécution si possible"
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Utilisation : @GPGCONF@ [options] (-h pour l'aide)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10890,15 -8592,12 +10813,15 @@@ msgstr "
"Syntaxe : @GPGCONF@ [options]\n"
"Gérer les options de configuration pour les outils du système @GNUPG@\n"
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr "Un argument de composant nécessaire"
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
msgid "Component not found"
msgstr "Composant introuvable"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
msgid "No argument allowed"
msgstr "Aucun argument permis"
@@@ -10950,122 -8640,97 +10873,122 @@@ msgstr "
"[options...] COMMANDE [entrée]\n"
"Appeler un simple outil de chiffrement symétrique\n"
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "interruption de %s sur %s avec l'état %i\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, c-format
msgid "%s on %s failed with status %i\n"
msgstr "échec de %s sur %s avec l'état %i\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "impossible de créer le répertoire temporaire « %s » : %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr "impossible d'ouvrir %s en écriture : %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, c-format
msgid "error writing to %s: %s\n"
msgstr "erreur d'écriture sur %s : %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, c-format
msgid "error reading from %s: %s\n"
msgstr "erreur de lecture de %s : %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, c-format
msgid "error closing %s: %s\n"
msgstr "erreur de fermeture de %s : %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
msgid "no --program option provided\n"
msgstr "aucune option --program fournie\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr "seuls --decrypt et --encrypt sont pris en charge\n"
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr "aucune option --keyfile fournie\n"
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr "impossible d'allouer le vecteur d'arguments\n"
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, c-format
msgid "could not create pipe: %s\n"
msgstr "impossible de créer un tube : %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, c-format
msgid "could not create pty: %s\n"
msgstr "impossible de créer le pty : %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr "impossible de créer un processus fils : %s\n"
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, c-format
msgid "execv failed: %s\n"
msgstr "échec d'execv : %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, c-format
msgid "select failed: %s\n"
msgstr "échec de select : %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, c-format
msgid "read failed: %s\n"
msgstr "échec de lecture : %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, c-format
msgid "pty read failed: %s\n"
msgstr "échec de lecture du pty : %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, c-format
msgid "waitpid failed: %s\n"
msgstr "échec de waitpid : %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr "interruption du fils avec l'état %i\n"
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "impossible d'allouer la chaîne infile : %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "impossible d'allouer la chaîne outfile : %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr "soit %s, soit %s doit être donné\n"
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr "aucune classe fournie\n"
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, c-format
msgid "class %s is not supported\n"
msgstr "la classe %s n'est pas prise en charge\n"
diff --cc po/gl.po
index 948cf41,4dc73fd..d5af6ec
--- a/po/gl.po
+++ b/po/gl.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.2.4\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2003-12-04 11:39+0100\n"
"Last-Translator: Jacobo Tarrio <jtarrio at trasno.net>\n"
"Language-Team: Galician <gpul-traduccion at ceu.fi.udc.es>\n"
@@@ -99,14 -83,10 +99,14 @@@ msgstr "Por favor, introduza o contrasi
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
#, fuzzy
msgid "Passphrase:"
msgstr "contrasinal err�neo"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr ""
@@@ -151,98 -123,70 +151,98 @@@ msgstr "MPI err�neo
msgid "Bad Passphrase"
msgstr "contrasinal err�neo"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, 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:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
msgstr "non se puido abrir `%s': %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, fuzzy, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, fuzzy, c-format
msgid "shadowing the key failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, fuzzy, c-format
msgid "error writing key: %s\n"
msgstr "erro escribindo no chaveiro `%s': %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "cambia-lo contrasinal"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
"%s%%0Awithin gpg-agent's key storage"
msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
@@@ -384,8 -302,6 +384,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "cambia-lo contrasinal"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -395,118 -311,87 +395,118 @@@ msgstr "
"Opci�ns:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "lareto"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ser un pouqui�o m�is calado"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "buscar chaves nun servidor de chaves"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualiza-la base de datos de confianza"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, 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:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
#, fuzzy
msgid "allow presetting passphrase"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "non est� soportado"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -515,136 -400,94 +515,128 @@@ 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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Por favor, informe dos erros no programa a <gnupg-bugs at gnu.org>,\n"
"e dos erros na traducci�n a <proxecto at trasno.net>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr ""
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "ficheiro de opci�ns `%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, 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:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "non foi posible crear %s: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, fuzzy, c-format
msgid "socket name '%s' is too long\n"
msgstr "Revocaci�n de certificado v�lida"
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
#, 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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, 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:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: directorio creado\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, 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:1958
++#: agent/gpg-agent.c:1957
#, 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:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erro lendo `%s': %s\n"
@@@ -659,28 -500,22 +651,28 @@@ msgstr "
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2390
++#: agent/gpg-agent.c:2392
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "o segredo da actualizaci�n fallou: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu chaves omitidas\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
@@@ -696,8 -529,6 +688,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -705,9 -536,6 +697,9 @@@ msgstr "
"@Comandos:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -728,40 -554,33 +720,40 @@@ msgid "
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
#, fuzzy
msgid "cancelled\n"
msgstr "Cancelar"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, fuzzy, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "erro lendo `%s': %s\n"
@@@ -931,42 -721,30 +923,42 @@@ msgstr "o algoritmo de protecci�n %d%s
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "erro lendo `%s': %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "erro lendo `%s': %s\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "erro lendo `%s': %s\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "erro lendo `%s': %s\n"
@@@ -981,37 -757,15 +973,18 @@@ msgstr "erro escribindo no chaveiro sec
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "non se puido conectar a `%s': %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "problema de comunicaci�n con gpg-agent\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
#, fuzzy
msgid "problem setting the gpg-agent options\n"
msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- #, fuzzy
- msgid "canceled by user\n"
- msgstr "cancelado polo usuario\n"
-
- #: common/simple-pwquery.c:579
- #, fuzzy
- msgid "problem with the agent\n"
- msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "non � posible deshabilita-los volcados de 'core': %s\n"
@@@ -1097,7 -834,6 +1070,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1121,17 -853,14 +1094,17 @@@ msgstr "
msgid "connection to agent is in restricted mode\n"
msgstr "non se pode facer iso no modo por lotes\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr ""
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1429,7 -1098,6 +1402,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
#, fuzzy
msgid "out of core\n"
msgstr "non procesado"
@@@ -1488,7 -1145,10 +1461,13 @@@ 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:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr ""
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "armadura: %s\n"
@@@ -1739,10 -1344,6 +1718,10 @@@ msgstr "non hai unha chave p�blica corr
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
@@@ -2041,27 -1577,18 +2020,27 @@@ msgstr "gravando a chave secreta en `%s
msgid "Invalid command (try \"help\")\n"
msgstr "Comando incorrecto (tente \"help\")\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output non traballa con este comando\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "non se puido abrir `%s'\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, 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:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "erro ao le-lo bloque de chaves: %s\n"
@@@ -2124,46 -1639,38 +2103,46 @@@ msgstr "�hai unha chave secreta para a
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "empregue a opci�n \"--delete-secret-keys\" para borrala primeiro.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "non se pode empregar un paquete sim�trico ESK debido ao modo S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, fuzzy, c-format
msgid "using cipher %s\n"
msgstr "fallou a sinatura: %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' xa est� comprimido\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "AVISO: `%s' � un ficheiro baleiro\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "lendo de `%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2172,18 -1679,15 +2151,18 @@@ msgstr "
"forza-lo algoritmo de compresi�n %s (%d) viola as preferencias do "
"destinatario\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "non se pode empregar %s no modo %s\n"
@@@ -2296,8 -1779,6 +2275,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: omitido: %s\n"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2334,8 -1808,6 +2313,8 @@@ msgstr "erro ao crear `%s': %s\n
msgid "[User ID not found]"
msgstr "[Non se atopou o id de usuario]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
@@@ -2405,218 -1864,169 +2384,218 @@@ msgstr "
msgid "using subkey %s instead of primary key %s\n"
msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "facer unha sinatura separada"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
#, fuzzy
msgid "make a clear text signature"
msgstr "|[ficheiro]|facer unha sinatura en texto claro"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "facer unha sinatura separada"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "cifrar datos"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "cifrar s� con cifrado sim�trico"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "descifrar datos (por defecto)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verificar unha sinatura"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "ve-la lista de chaves"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "ve-la lista de chaves e sinaturas"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "list and check key signatures"
msgstr "verifica-las sinaturas das chaves"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "ve-la lista de chaves e pegadas dactilares"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "ve-la lista de chaves secretas"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "xerar un novo par de chaves"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "xerar un novo par de chaves"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "xerar un novo par de chaves"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "xerar un novo par de chaves"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "xerar un certificado de revocaci�n"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "borrar chaves do chaveiro p�blico"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "borrar chaves do chaveiro secreto"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "asinar unha chave"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "asinar unha chave localmente"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "asinar unha chave"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "asinar unha chave localmente"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "asinar ou editar unha chave"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "cambia-lo contrasinal"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "exportar chaves"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "exportar chaves a un servidor de chaves"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "importar chaves dun servidor de chaves"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "buscar chaves nun servidor de chaves"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "actualizar t�dalas chaves dun servidor de chaves"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "importar/mesturar chaves"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "actualiza-la base de datos de confianza"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
#, fuzzy
msgid "print message digests"
msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "crear sa�da con armadura en ascii"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifrar para NOME"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "empregar este id de usuario para asinar ou descifrar"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "non facer ning�n cambio"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "avisar antes de sobrescribir"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2624,7 -2034,6 +2603,7 @@@ msgstr "
"@\n"
"(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2644,13 -2053,11 +2623,13 @@@ msgstr "
" --list-keys [nomes] amosa-las chaves\n"
" --fingerprint [nomes] amosa-las pegadas dactilares\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2665,7 -2072,6 +2644,7 @@@ msgstr "
"asinar, verificar, cifrar ou descifrar\n"
"a operaci�n por defecto depende dos datos de entrada\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2673,607 -2079,473 +2652,602 @@@ msgstr "
"\n"
"Algoritmos soportados:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "P�blica: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Cifra: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Compresi�n: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uso: gpg [opci�ns] "
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "comandos conflictivos\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "non se atopou un signo = na definici�n do grupo \"%s\"\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "amosar en que chaveiro est� unha chave listada"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "deshabilitar unha chave"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "destinatario por defecto `%s' desco�ecido\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "destinatario por defecto `%s' desco�ecido\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, fuzzy, c-format
#| msgid "NOTE: old default options file `%s' ignored\n"
msgid "Note: old default options file '%s' ignored\n"
msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr ""
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "NOTA: �%s non � para uso normal!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s non � un xogo de caracteres v�lido\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "Non � un enderezo de e-mail v�lido\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritmo de hash non v�lido `%s'\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s non � un xogo de caracteres v�lido\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
#, fuzzy
msgid "invalid list options\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
#, fuzzy
msgid "invalid verify options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "non se puido estabrecer exec-path a %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s fai que se ignore %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�%s non se admite con %s!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser superior a 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser superior a 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth debe valer entre 1 e 255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "preferencias por defecto non v�lidas\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "preferencias de cifrado personais non v�lidas\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "preferencias de resumo personais non v�lidas\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "preferencias de compresi�n personais non v�lidas\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "�%s a�nda non traballa con %s!\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, fuzzy, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, fuzzy, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, fuzzy, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "non se pode empregar o algoritmo de compresi�n \"%s\" no modo %s\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"AVISO: deronse destinatarios (-r) sen empregar cifrado de chave p�blica\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [ficheiro]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [ficheiro]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "o descifrado fallou: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [ficheiro]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "non se pode empregar %s no modo %s\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [ficheiro]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "non se pode empregar %s no modo %s\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [ficheiro]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [ficheiro]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [ficheiro]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key id-de-usuario"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key id-de-usuario"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-de-usuario [comandos]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id-de-usuario"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "o env�o ao servidor de chaves fallou: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "a recepci�n do servidor de chaves fallou: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "a exportaci�n da chave fallou: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "a exportaci�n da chave fallou: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "a busca no servidor de chaves fallou fallou: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "non se puido quita-la armadura: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "algoritmo de hash non v�lido `%s'\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[ficheiro]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Escriba a s�a mensaxe ...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@@ -3318,332 -2582,266 +3292,332 @@@ msgstr "Non hai axuda dispo�ible
msgid "No help available for '%s'"
msgstr "Non hai axuda dispo�ible para `%s'"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "actualiza-la base de datos de confianza"
- #: g10/import.c:143
++#: g10/import.c:147
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "actualiza-la base de datos de confianza"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
msgid "show key during import"
msgstr "amosar fingerprint"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:152
++#: g10/import.c:156
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "chave secreta non utilizable"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "pasando por alto un bloque de tipo %d\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu chaves procesadas hasta polo momento\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "N�mero total procesado: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr "novas chaves omitidas: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr "novas chaves omitidas: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sin IDs de usuario: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importadas: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " sin cambios: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novos IDs de usuario: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novas sub-chaves: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " novas sinaturas: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novas revocaci�ns de chaves: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr "chaves secretas lidas: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "chaves secretas importadas: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "chaves secretas sin cambios: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " non importadas: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " novas sinaturas: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr "chaves secretas lidas: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1042
++#: g10/import.c:1048
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "Sinatura %s, algoritmo de resumo %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chave %08lX: non hai ID de usuario\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "om�tese `%s': %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1264
++#: g10/import.c:1343
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "chave %08lX: arranxouse a corrupci�n da sub-chave HKP\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "chave %08lX: non hai IDs de usuario v�lidos\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "chave %08lX: chave p�blica non atopada: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "chave %08lX: nova chave - omitida\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "erro escribindo no chaveiro `%s': %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "chave %08lX: non coincide coa nosa copia\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr ""
"chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
"%s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr ""
"chave %08lX: non foi posible le-lo bloque de chaves original:\n"
"%s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chave %08lX: \"%s\" sen cambios\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chave %08lX: chave secreta importada\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "om�tese: a chave secreta xa est� presente\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "non se atopou a chave secreta `%s': %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "chave %08lX: chave secreta cunha cifra %d non v�lida - omitida\n"
@@@ -3658,148 -2856,121 +3632,148 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"chave %08lX: non hai chave p�blica - non se pode aplica-lo\n"
"certificado de revocaci�n\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr ""
"chave %08lX: certificado de revocaci�n incorrecto:\n"
"%s - rechazado\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"chave %08lX: algoritmo de chave p�blica non soportado no ID de usuario \"%s"
"\"\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr ""
"chave %08lX: auto-sinatura non v�lida no identificadr de usuario \"%s\"\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "chave %08lX: algoritmo de chave p�blica non soportado\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "chave %08lX: non hai sub-chave para a ligaz�n da chave\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "chave %08lX: eliminouse unha ligaz�n de sub-chave m�ltiple\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "chave %08lX: non hai unha sub-chave para a revocaci�n da chave\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "chave %08lX: revocaci�n de sub-chave non v�lida\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "chave %08lX: eliminouse a revocaci�n de sub-chaves m�ltiples\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chave %08lX: omitido o ID de usuario '"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chave %08lX: omitida a sub-chave\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "chave %08lX: certificado de revocaci�n no lugar err�neo - omitido\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "chave %08lX: certificado de revocaci�n incorrecto: %s - omitido\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocaci�n "
"%08lX\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
"ausente.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
@@@ -4155,8 -3264,6 +4129,8 @@@ msgstr "
msgid "Really sign? (y/N) "
msgstr "�Asinar de verdade? "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "fallou a sinatura: %s\n"
@@@ -4648,14 -3653,10 +4622,14 @@@ msgstr "
"Te�a en conta que a validez da chave amosada non � necesariamente\n"
"correcta a menos que reinicie o programa.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
#, fuzzy
msgid "revoked"
msgstr "[revocada] "
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5625,19 -4448,16 +5599,19 @@@ msgstr " Pegada dactilar =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "comprobando o chaveiro `%s'\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "%lu chaves comprobadas (%lu sinaturas)\n"
msgstr[1] "%lu chaves comprobadas (%lu sinaturas)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, fuzzy, c-format
#| msgid "\t%lu keys updated\n"
msgid "%lu key cached"
@@@ -5645,7 -4465,6 +5619,7 @@@ msgid_plural "%lu keys cached
msgstr[0] "\t%lu chaves actualizadas\n"
msgstr[1] "\t%lu chaves actualizadas\n"
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5653,7 -4472,6 +5627,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 sinatura err�nea\n"
msgstr[1] "1 sinatura err�nea\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: chaveiro creado\n"
@@@ -5874,118 -4647,98 +5848,123 @@@ msgstr "revocaci�n independente - empre
msgid "no signature found\n"
msgstr "Sinatura correcta de \""
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Sinatura INCORRECTA de\""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Sinatura caducada de \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Sinatura correcta de \""
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "verificaci�n de sinatura suprimida\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "non se poden manexar estas sinaturas m�ltiples\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "A sinatura caducou o %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Sinatura feita o %.*s usando %s coa chave de ID %08lX\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ msgid " issuer \"%s\"\n"
+ msgstr " alias \""
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "Chave dispo�ible en: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[incerto]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "A sinatura caducou o %s\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "A sinatura caduca o %s\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "Sinatura %s, algoritmo de resumo %s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "binario"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "modo texto"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "desco�ecido"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritmo de chave p�blica desco�ecido"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Non foi posible verifica-la sinatura: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "non � unha sinatura separada\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"AVISO: detect�ronse sinaturas m�ltiples. S� se ha comproba-la primeira.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "sinatura independiente de clase 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "Sinatura � vello estilo (PGP 2.x)\n"
@@@ -6170,88 -4888,44 +6149,55 @@@ msgstr "
msgid "subpacket of type %d has critical bit set\n"
msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, fuzzy, c-format
- msgid " (main key ID %s)"
- msgstr " (ID principal da chave %08lX)"
-
- #: g10/passphrase.c:277
- #, fuzzy, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Precisa un contrasinal para desbloquea-la chave secreta do usuario:\n"
- "\"%.*s\"\n"
- "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Introduza o contrasinal\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "cancelado polo usuario\n"
- #: g10/passphrase.c:483
++#: g10/passphrase.c:489
#, fuzzy, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "\n"
- "Necesita un contrasinal para desbloquea-la chave secreta para\n"
- "o usuario \""
-
- #: g10/passphrase.c:491
- #, fuzzy, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%u-bits, chave %s, ID %08lX, creada %s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr ""
+ msgid " (main key ID %s)"
+ msgstr " (ID principal da chave %08lX)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6455,130 -5094,103 +6401,130 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "�Empregar esta chave de t�dolos xeitos?"
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "AVISO: �Empr�gase unha chave que non � de confianza!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
#, fuzzy
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr ""
"AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
"ausente.\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
#, fuzzy
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Isto pode significar que a sinatura est� falsificada.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "AVISO: �Esta subchave est� revocada polo propietario!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Nota: Esta chave est� desactivada.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Nota: �Esta chave xa caducou!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "AVISO: �Esta chave non est� certificada cunha sinatura de confianza!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVISO: �Esta chave NON � de confianza!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " Probablemente, a sinatura estea FALSIFICADA.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"AVISO: �Esta chave non est� certificada con sinaturas de suficiente "
"confianza!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
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:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: omitido: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: omitido: a chave p�blica est� desactivada\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: omitido: a chave p�blica xa est� presente\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, 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:991
++#: g10/pkclist.c:995
#, 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:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6586,38 -5198,30 +6532,38 @@@ msgstr "
"\n"
"Introduza o ID de usuario. Remate cunha li�a en branco: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Non hai tal ID de usuario.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
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:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "A chave p�blica est� desactivada.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "omitido: chave p�blica xa estabrecida\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatario por defecto `%s' desco�ecido\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "non hai enderezos v�lidos\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "chave %08lX: non hai ID de usuario\n"
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "chave %08lX: non hai ID de usuario\n"
@@@ -6898,7 -5450,6 +6844,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "a chave p�blica %08lX � %lu segundo m�is nova c� sinatura\n"
msgstr[1] "a chave p�blica %08lX � %lu segundo m�is nova c� sinatura\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6972,23 -5514,19 +6918,23 @@@ msgid "
"unexpanded.\n"
msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "Sinatura %s de: \"%s\"\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "asinando:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "hase empregar cifrado %s\n"
@@@ -7098,7 -5616,6 +7044,7 @@@ msgstr "transacci�n da base de datos d
msgid "%s: directory does not exist!\n"
msgstr "%s: �o directorio non existe!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "non se pode pechar `%s': %s\n"
@@@ -7210,150 -5705,117 +7156,142 @@@ msgstr "non � posible manexar li�as de
msgid "input line longer than %d characters\n"
msgstr "a li�a de entrada cont�n m�is de %d caracteres\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Algoritmos soportados:\n"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "erro lendo `%s': %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Normativa: "
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "ve-la lista de chaves"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7363,93 -5825,78 +7301,93 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "erro lendo `%s': %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
msgid "Verified %ld messages signed by \"%s\"."
msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7460,20 -5907,16 +7398,20 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7490,8 -5933,6 +7428,7 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
@@@ -8033,7 -6365,6 +7970,7 @@@ msgstr "Introduza o ID de usuario:
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8089,16 -6409,13 +8026,16 @@@ msgid "
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8203,12 -6497,10 +8140,12 @@@ msgstr "
msgid "checking the CRL failed: %s"
msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, fuzzy, c-format
msgid "certificate with invalid validity: %s"
msgstr "problema de lectura do certificado: %s\n"
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
#, fuzzy
msgid "certificate not yet valid"
msgstr "Revocaci�n de certificado v�lida"
@@@ -8223,7 -6513,6 +8160,7 @@@ msgstr "Revocaci�n de certificado v�lid
msgid "intermediate certificate not yet valid"
msgstr "Revocaci�n de certificado v�lida"
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
#, fuzzy
msgid "certificate has expired"
msgstr "problema de lectura do certificado: %s\n"
@@@ -8279,7 -6557,6 +8216,7 @@@ msgstr "Revocaci�n de certificado v�lid
msgid " ( issuer valid from "
msgstr ""
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "Pegada dactilar:"
@@@ -8312,7 -6583,6 +8249,7 @@@ msgstr "Certificado correcto
msgid "self-signed certificate has a BAD signature"
msgstr ""
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
#, fuzzy
msgid "root certificate is not marked trusted"
msgstr ""
@@@ -8324,31 -6593,25 +8261,31 @@@
msgid "checking the trust list failed: %s\n"
msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
#, fuzzy
msgid "certificate chain too long\n"
msgstr "Revocaci�n de certificado v�lida"
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
#, fuzzy
msgid "issuer certificate not found"
msgstr "Revocaci�n de certificado v�lida"
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "verificar unha sinatura"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr ""
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
#, fuzzy
msgid "certificate is good\n"
msgstr "Revocaci�n de certificado v�lida"
@@@ -8383,7 -6640,6 +8320,7 @@@ msgstr "
msgid "(this is the MD2 algorithm)\n"
msgstr ""
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
#, fuzzy
msgid "none"
msgstr "non|nom"
@@@ -8419,36 -6670,28 +8356,36 @@@ msgstr "
"\"%.*s\"\n"
"Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr ""
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr ""
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr ""
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr ""
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr ""
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr ""
@@@ -8889,22 -7042,18 +8826,22 @@@ msgstr "
msgid "%s:%u: skipping this line\n"
msgstr " o = omitir esta chave\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "escribindo a `%s'\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "non se pode pechar `%s': %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8967,7 -7104,6 +8904,7 @@@ msgstr "rev? problema ao comproba-la re
msgid "error storing flags: %s\n"
msgstr "erro lendo `%s': %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr ""
@@@ -9086,98 -7201,73 +9023,92 @@@ msgstr "
msgid "dropping %u certificates from the cache\n"
msgstr ""
- #: dirmngr/certcache.c:352
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
- msgid "can't access directory '%s': %s\n"
- msgstr "non se pode crea-lo directorio `%s': %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't parse certificate '%s': %s\n"
msgstr "non se pode crear `%s': %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, fuzzy, c-format
msgid "certificate '%s' already cached\n"
msgstr "certificado duplicado - borrado"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, fuzzy, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "certificado duplicado - borrado"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, fuzzy, c-format
msgid "certificate '%s' loaded\n"
msgstr "certificado duplicado - borrado"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, fuzzy, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr "Pegada dactilar:"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, fuzzy, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, fuzzy, c-format
msgid "permanently loaded certificates: %u\n"
msgstr "Certificado non v�lido"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, fuzzy, c-format
msgid " runtime cached certificates: %u\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
#, fuzzy
msgid "certificate already cached\n"
msgstr "Creouse o certificado de revocaci�n.\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
#, fuzzy
msgid "certificate cached\n"
msgstr "Revocaci�n de certificado v�lida"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, fuzzy, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "erro: pegada dactilar non v�lida\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, fuzzy, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, fuzzy, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
#, fuzzy
msgid "no issuer found in certificate\n"
msgstr "Certificado correcto"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, fuzzy, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
@@@ -9439,7 -7478,6 +9370,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
@@@ -9462,7 -7497,6 +9393,7 @@@ msgstr "resposta do axente non v�lida\n
msgid "converting S-expression failed: %s\n"
msgstr "o cambio de permisos de `%s' fallou: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, fuzzy, c-format
#| msgid "changing permission of `%s' failed: %s\n"
msgid "creating S-expression failed: %s\n"
@@@ -9862,116 -7816,85 +9793,112 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr ""
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
#, fuzzy
msgid "run without asking a user"
msgstr "�Sa�r sin gardar? "
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9984,91 -7907,72 +9911,91 @@@ msgstr "
"@\n"
"(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uso: gpg [opci�ns] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
#, 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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "li�a longa de m�is\n"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "erro: pegada dactilar non v�lida\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "erro de lectura: %s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
#, fuzzy
msgid "shutdown forced\n"
msgstr "non procesado"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10413,102 -8247,81 +10340,102 @@@ msgstr "o cambio de permisos de `%s' fa
msgid "not signed by a default OCSP signer's certificate"
msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, fuzzy, c-format
msgid "allocating list item failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, fuzzy, c-format
msgid "error getting responder ID: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr ""
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, fuzzy, c-format
msgid "issuer certificate not found: %s\n"
msgstr "Revocaci�n de certificado v�lida"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr ""
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
#, fuzzy
msgid "caller did not return the issuing certificate\n"
msgstr "Certificado correcto"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, fuzzy, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, fuzzy, c-format
#| msgid "%s: can't access: %s\n"
msgid "can't get authorityInfoAccess: %s\n"
msgstr "%s: non � posible acceder: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
#, fuzzy
#| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
msgstr "non hai un chaveiro privado por defecto: %s\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr ""
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, fuzzy, c-format
msgid "using OCSP responder '%s'\n"
msgstr "fallou a sinatura: %s\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, fuzzy, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, fuzzy, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "NOTA: a chave est� revocada"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr ""
@@@ -10556,33 -8359,27 +10483,33 @@@ msgstr "fallou o borrado do bloque de c
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "non se pode crear `%s': %s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, 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:2436
++#: dirmngr/server.c:2398
#, 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:2444
++#: dirmngr/server.c:2406
#, 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:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10607,34 -8400,24 +10534,30 @@@ msgstr "
msgid "checking CRL for"
msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
#, fuzzy
msgid "selfsigned certificate has a BAD signature"
msgstr "verificar unha sinatura"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, fuzzy, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
#, fuzzy
msgid "certificate chain is good\n"
msgstr "Revocaci�n de certificado v�lida"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "abandonar"
@@@ -10763,11 -8515,9 +10686,11 @@@ msgstr "
msgid "Options enforcing a passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
@@@ -10907,85 -8625,66 +10830,85 @@@ msgstr "
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
#, fuzzy
msgid "list global configuration file"
msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
#, fuzzy
msgid "check global configuration file"
msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "usar coma ficheiro de sa�da"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
#, fuzzy
msgid "Component not found"
msgstr "non se atopou a chave p�blica"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
#, fuzzy
msgid "No argument allowed"
msgstr "gravando a chave secreta en `%s'\n"
@@@ -11039,125 -8729,100 +10962,125 @@@ msgid "
"Call a simple symmetric encryption tool\n"
msgstr ""
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "�%s non se admite con %s!\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr ""
"a actualizaci�n da base de datos de confianza fallou:\n"
"%s\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, fuzzy, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "non se pode crea-lo directorio `%s': %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "non se puido abrir %s: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "erro escribindo no chaveiro `%s': %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "erro lendo `%s': %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "erro lendo `%s': %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
#, fuzzy
msgid "no --program option provided\n"
msgstr "non se soporta a execuci�n remota de programas\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr ""
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr ""
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "non foi posible crear %s: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "non foi posible crear %s: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, fuzzy, c-format
msgid "could not fork: %s\n"
msgstr "%s: non se atopou o usuario: %s\n"
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "non se pode crear `%s': %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "non se pode crear `%s': %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr ""
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
diff --cc po/gnupg2.pot
index 43a95c4,15677d7..bb5c186
--- a/po/gnupg2.pot
+++ b/po/gnupg2.pot
@@@ -1,27 -1,28 +1,27 @@@
-# Traditional Chinese(zh-tw) messages for GnuPG
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
-# Jedi Lin <Jedi at Jedi.org>, 2003~2013.
-#
-# Special thanks to "Audrey Tang <audreyt at audreyt.org>".
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
+#, fuzzy
msgid ""
msgstr ""
- "Project-Id-Version: GNU gnupg 2.1.14\n"
-"Project-Id-Version: GNU gnupg 2.1.0\n"
++"Project-Id-Version: GNU gnupg 2.1.15\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
-"PO-Revision-Date: 2014-11-22 20:56+0800\n"
-"Last-Translator: Jedi Lin <Jedi at Jedi.org>\n"
-"Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
-"Language: zh_TW\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Basepath: gnupg-2.1.0/\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.7\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+#: agent/call-pinentry.c:257
#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
-msgstr "個人識別碼項目鎖定獲取失敗: %s\n"
+msgstr ""
#. TRANSLATORS: These are labels for buttons etc used in
#. Pinentries. An underscore indicates that the next letter
@@@ -97,156 -96,115 +97,156 @@@ msgstr "
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
msgid "Passphrase:"
-msgstr "密語:"
+msgstr ""
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
-msgstr "前後不一致 - 請再試一次"
+msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#: agent/call-pinentry.c:959
#, c-format
msgid "SETERROR %s (try %d of %d)"
-msgstr "設定錯誤: %s (第 %d 次嘗試, 最多 %d 次)"
+msgstr ""
+#: agent/call-pinentry.c:971
msgid "Repeat:"
-msgstr "重複:"
+msgstr ""
+#: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
msgid "PIN too long"
-msgstr "個人識別碼 (PIN) 太長"
+msgstr ""
+#: agent/call-pinentry.c:1002
msgid "Passphrase too long"
-msgstr "密語太長"
+msgstr ""
+#: agent/call-pinentry.c:1010
msgid "Invalid characters in PIN"
-msgstr "個人識別碼 (PIN) 含有無效的字符"
+msgstr ""
+#: agent/call-pinentry.c:1015
msgid "PIN too short"
-msgstr "個人識別碼 (PIN) 太短"
+msgstr ""
+#: agent/call-pinentry.c:1028
msgid "Bad PIN"
-msgstr "不良的個人識別碼 (PIN)"
+msgstr ""
+#: agent/call-pinentry.c:1028
msgid "Bad Passphrase"
-msgstr "不良的密語"
+msgstr ""
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
-msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
+msgstr ""
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, c-format
msgid "can't create '%s': %s\n"
-msgstr "無法建立 '%s': %s\n"
+msgstr ""
- #: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, c-format
msgid "can't open '%s': %s\n"
-msgstr "無法開啟 '%s': %s\n"
+msgstr ""
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, c-format
msgid "error getting serial number of card: %s\n"
-msgstr "取得此卡片序號時出錯: %s\n"
+msgstr ""
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
-msgstr "偵測到卡片, 其序號為: %s\n"
+msgstr ""
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, c-format
msgid "no authentication key for ssh on card: %s\n"
-msgstr "卡片上沒有 ssh 用的認證金鑰: %s\n"
+msgstr ""
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, c-format
msgid "no suitable card key found: %s\n"
-msgstr "找不到合適的卡片金鑰: %s\n"
+msgstr ""
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, c-format
msgid "shadowing the key failed: %s\n"
-msgstr "遮蔽金鑰時失敗: %s\n"
+msgstr ""
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, c-format
msgid "error writing key: %s\n"
-msgstr "寫入金鑰時出錯: %s\n"
+msgstr ""
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
-"有某個 ssh 程序提出使用金鑰 %%0A %s%%0A (%s)%%0A 之請求, 請問是否允許?"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
-msgstr "允許"
+msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
-msgstr "拒絕"
+msgstr ""
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
-msgstr "請輸入此 ssh 金鑰的密語 %%0A %F%%0A (%c)"
+msgstr ""
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
msgid "Please re-enter this passphrase"
-msgstr "請再次輸入密語"
+msgstr ""
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
"%s%%0Awithin gpg-agent's key storage"
msgstr ""
-"請輸入密語以保護收到的私鑰 %%0A %s%%0A %s%%0A 於 gpg-agent 的金鑰存放處"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, c-format
msgid "failed to create stream from socket: %s\n"
-msgstr "從 socket 建立串流失敗: %s\n"
+msgstr ""
+#: agent/divert-scd.c:92 g10/call-agent.c:1268
msgid "Please insert the card with serial number"
-msgstr "請插入下列序號的卡片:"
+msgstr ""
+#: agent/divert-scd.c:93 g10/call-agent.c:1269
msgid "Please remove the current card and insert the one with serial number"
-msgstr "請移除現用中的卡片並插入下列序號的卡片:"
+msgstr ""
+#: agent/divert-scd.c:204
msgid "Admin PIN"
-msgstr "管理者個人識別碼 (PIN)"
+msgstr ""
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
@@@ -339,321 -279,240 +339,313 @@@ msgstr[1] "
msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
msgid_plural ""
"A passphrase should contain at least %u digits or%%0Aspecial characters."
-msgstr[0] "密語至少得要含有 %u 個數字或%%0A特別字符."
+msgstr[0] ""
+msgstr[1] ""
-#, fuzzy, c-format
-#| msgid "A passphrase may not be a known term or match%%0Acertain pattern."
+#: agent/genkey.c:278
+#, c-format
msgid "A passphrase may not be a known term or match%%0Acertain pattern."
-msgstr "密語不得含有已知的詞彙, 亦不得與%%0A確知的模式吻合."
+msgstr ""
+#: agent/genkey.c:293
msgid "Warning: You have entered an insecure passphrase."
-msgstr "警告: 你輸入了不安全的密語."
+msgstr ""
+#: agent/genkey.c:480
#, c-format
msgid "Please enter the passphrase to%0Aprotect your new key"
-msgstr "請輸入密語至%0A以保護你的新金鑰"
+msgstr ""
+#: agent/genkey.c:606
msgid "Please enter the new passphrase"
-msgstr "請輸入新的密語"
+msgstr ""
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
msgstr ""
-"@選項:\n"
-" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
-msgstr "以服務模式執行 (背景)"
+msgstr ""
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
-msgstr "以伺服器模式執行 (前景)"
+msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
-msgstr "囉唆模式"
+msgstr ""
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
-msgstr "盡量安靜些"
+msgstr ""
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
-msgstr "sh 樣式的指令輸出"
+msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
-msgstr "csh 樣式的指令輸出"
+msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
-msgstr "|檔案|從指定檔案中讀取選項"
+msgstr ""
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
-msgstr "不要從 console 分離"
+msgstr ""
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
-msgstr "不要奪取鍵盤及滑鼠"
+msgstr ""
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
msgid "use a log file for the server"
-msgstr "為伺服器使用日誌檔"
+msgstr ""
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PGM|使用 PGM 做為 PIN-Entry 程式"
+msgstr ""
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
+msgstr ""
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
msgid "do not use the SCdaemon"
-msgstr "不要使用 SCdaemon"
+msgstr ""
- #: agent/gpg-agent.c:181
-#, fuzzy
-#| msgid "|NAME|connect to host NAME"
++#: agent/gpg-agent.c:180
msgid "|NAME|accept some commands via NAME"
-msgstr "|名稱|連線至位於指定名稱的主機"
+msgstr ""
- #: agent/gpg-agent.c:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
-msgstr "忽略變更 TTY 的要求"
+msgstr ""
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
-msgstr "忽略變更 X display 的要求"
+msgstr ""
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
-msgstr "|N|讓快取住的個人識別碼 (PIN) 在 N 秒後到期"
+msgstr ""
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
-msgstr "簽署時不要使用個人識別碼 (PIN) 快取"
+msgstr ""
- #: agent/gpg-agent.c:218
-#, fuzzy
-#| msgid "do not allow the reuse of old passphrases"
++#: agent/gpg-agent.c:217
msgid "disallow the use of an external password cache"
-msgstr "不允許重複使用舊密語"
+msgstr ""
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
-msgstr "不允許用戶端將金鑰標記為 \"已信任\""
+msgstr ""
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
msgid "allow presetting passphrase"
-msgstr "允許預先設定密語"
+msgstr ""
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
msgid "enable ssh support"
-msgstr "啟用 ssh 支援"
+msgstr ""
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
msgid "enable putty support"
-msgstr "啟用 putty 支援"
+msgstr ""
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
-msgstr "翻譯瑕疵請回報給 <Jedi at Jedi.org>, 程式瑕疵則請回報給 <@EMAIL@>.\n"
+msgstr ""
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
-msgstr "用法: @GPG_AGENT@ [選項] (或用 -h 求助)"
+msgstr ""
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
-"語法: @GPG_AGENT@ [選項] [指令 [引數]]\n"
-"@GNUPG@ 私鑰管理\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
-msgstr "給定的除錯等級 '%s' 無效\n"
+msgstr ""
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr ""
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, c-format
msgid "Note: no default option file '%s'\n"
-msgstr "請注意: 沒有預設選項檔 '%s'\n"
+msgstr ""
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, c-format
msgid "option file '%s': %s\n"
-msgstr "選項檔 '%s': %s\n"
+msgstr ""
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, c-format
msgid "reading options from '%s'\n"
-msgstr "從 '%s' 讀取選項中\n"
+msgstr ""
- #: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, c-format
msgid "Note: '%s' is not considered an option\n"
-msgstr "請注意: '%s' 並不當成選項\n"
+msgstr ""
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, c-format
msgid "can't create socket: %s\n"
-msgstr "無法建立 socket: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, c-format
msgid "socket name '%s' is too long\n"
-msgstr "socket 名稱 '%s' 太長\n"
+msgstr ""
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
msgid "a gpg-agent is already running - not starting a new one\n"
-msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
+msgstr ""
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
msgid "error getting nonce for the socket\n"
-msgstr "為 socket 取得 nonce 時出錯\n"
+msgstr ""
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, c-format
msgid "error binding socket to '%s': %s\n"
-msgstr "綁定 socket 至 '%s' 時出錯: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
-#, fuzzy, c-format
-#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
+#, c-format
msgid "can't set permissions of '%s': %s\n"
-msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
+msgstr ""
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, c-format
msgid "listen() failed: %s\n"
-msgstr "listen() 失敗: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, c-format
msgid "listening on socket '%s'\n"
-msgstr "正在候聽 socket '%s'\n"
+msgstr ""
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, c-format
msgid "can't create directory '%s': %s\n"
-msgstr "無法建立目錄 '%s': %s\n"
+msgstr ""
- #: agent/gpg-agent.c:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
-msgstr "目錄 '%s' 已建立\n"
+msgstr ""
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, c-format
msgid "stat() failed for '%s': %s\n"
-msgstr "'%s' 的 stat() 失敗: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
#, c-format
msgid "can't use '%s' as home directory\n"
-msgstr "無法使用 '%s' 做為家目錄\n"
+msgstr ""
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, c-format
msgid "error reading nonce on fd %d: %s\n"
-msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
+msgstr ""
+#: agent/gpg-agent.c:2307
#, c-format
msgid "handler 0x%lx for fd %d started\n"
-msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
+msgstr ""
+#: agent/gpg-agent.c:2312
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
-msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
+msgstr ""
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
-msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
+msgstr ""
- #: agent/gpg-agent.c:2390
++#: agent/gpg-agent.c:2392
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
-msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
+msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
-msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
+msgstr ""
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, c-format
msgid "%s %s stopped\n"
-msgstr "%s %s 已停止\n"
+msgstr ""
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
-msgstr "在此階段中沒有執行中的 gpg-agent\n"
+msgstr ""
+#: agent/preset-passphrase.c:99
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
-msgstr "用法: gpg-preset-passphrase [選項] 金鑰鑰柄 (或用 -h 求助)\n"
+msgstr ""
+#: agent/preset-passphrase.c:102
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
msgstr ""
-"語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
-"密碼快取維護\n"
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
msgstr ""
-"@指令:\n"
-" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -669,74 -529,64 +661,74 @@@ msgid "
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-"語法: gpg-protect-tool [選項] [引數]\n"
-"私鑰維護工具\n"
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
-msgstr "請輸入密語來取消 PKCS#12 物件的保護."
+msgstr ""
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
msgid "Please enter the passphrase to protect the new PKCS#12 object."
-msgstr "請輸入密語來保護新的 PKCS#12 物件."
+msgstr ""
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
-msgstr "請輸入密語以保護匯入至 GnuPG 系統內的物件."
+msgstr ""
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr ""
-"請輸入完成這項操作所需的\n"
-"密語或個人識別碼 (PIN)."
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
msgid "cancelled\n"
-msgstr "已取消\n"
+msgstr ""
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, c-format
msgid "error while asking for the passphrase: %s\n"
-msgstr "詢問密語時出錯: %s\n"
+msgstr ""
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, c-format
msgid "error opening '%s': %s\n"
-msgstr "開啟 '%s' 時出錯: %s\n"
+msgstr ""
+#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
#, c-format
msgid "file '%s', line %d: %s\n"
-msgstr "檔案 '%s', 第 %d 列: %s\n"
+msgstr ""
+#: agent/trustlist.c:192 agent/trustlist.c:200
#, c-format
msgid "statement \"%s\" ignored in '%s', line %d\n"
-msgstr "陳述句 \"%s\" 忽略於 '%s', 第 %d 列\n"
+msgstr ""
+#: agent/trustlist.c:206
#, c-format
msgid "system trustlist '%s' not available\n"
-msgstr "沒有系統信任清單 '%s' 可用\n"
+msgstr ""
+#: agent/trustlist.c:250
#, c-format
msgid "bad fingerprint in '%s', line %d\n"
-msgstr "不良的指紋於 '%s', 第 %d 列\n"
+msgstr ""
+#: agent/trustlist.c:275 agent/trustlist.c:282
#, c-format
msgid "invalid keyflag in '%s', line %d\n"
-msgstr "無效的金鑰旗標於 '%s', 第 %d 列\n"
+msgstr ""
+#: agent/trustlist.c:316 common/helpfile.c:136
#, c-format
msgid "error reading '%s', line %d: %s\n"
-msgstr "讀取 '%s' 時出錯, 第 %d 列: %s\n"
+msgstr ""
+#: agent/trustlist.c:434 agent/trustlist.c:503
msgid "error reading list of trusted root certificates\n"
-msgstr "讀取已信任根憑證清單時出錯\n"
+msgstr ""
#. TRANSLATORS: This prompt is shown by the Pinentry
#. and has one special property: A "%%0A" is used by
@@@ -824,638 -661,489 +816,627 @@@ msgid "
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
-"警告: 這把金鑰同時列為 SSH 所使用!\n"
-"刪除這把金鑰可能會讓你失去存取遠端機器的能力."
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
-msgstr "DSA 需要 8 位元倍數的雜湊長度\n"
+msgstr ""
+#: agent/pksign.c:187 sm/certcheck.c:97
#, c-format
msgid "%s key uses an unsafe (%u bit) hash\n"
-msgstr "金鑰 %s 使用不安全 (%u 位元) 的雜湊\n"
+msgstr ""
+#: agent/pksign.c:204
#, c-format
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
-msgstr "%zu 位元的雜湊對 %u 位元的 %s 金鑰無效\n"
+msgstr ""
+#: agent/pksign.c:512
#, c-format
msgid "checking created signature failed: %s\n"
-msgstr "檢查已建立的簽章時出錯: %s\n"
+msgstr ""
+#: agent/cvt-openpgp.c:338
msgid "secret key parts are not available\n"
-msgstr "私鑰部分無法取用\n"
+msgstr ""
+#: agent/cvt-openpgp.c:344
#, c-format
msgid "public key algorithm %d (%s) is not supported\n"
-msgstr "公鑰演算法 %d (%s) 未支援\n"
+msgstr ""
+#: agent/cvt-openpgp.c:448
#, c-format
msgid "protection algorithm %d (%s) is not supported\n"
-msgstr "保護演算法 %d (%s) 未支援\n"
+msgstr ""
+#: agent/cvt-openpgp.c:455
#, c-format
msgid "protection hash algorithm %d (%s) is not supported\n"
-msgstr "保護雜湊演算法 %d (%s) 未支援\n"
+msgstr ""
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
-msgstr "建立管道時出錯: %s\n"
+msgstr ""
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, c-format
msgid "error creating a stream for a pipe: %s\n"
-msgstr "建立管道串流時出錯: %s\n"
+msgstr ""
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, c-format
msgid "error forking process: %s\n"
-msgstr "衍生執行程序時出錯: %s\n"
+msgstr ""
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
-#, fuzzy, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
+#, c-format
msgid "waiting for processes to terminate failed: %s\n"
-msgstr "等候 %d 處理程序終止時失敗: %s\n"
+msgstr ""
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, c-format
msgid "error running '%s': probably not installed\n"
-msgstr "執行 '%s' 時出錯: 可能尚未安裝\n"
+msgstr ""
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, c-format
msgid "error running '%s': exit status %d\n"
-msgstr "執行 '%s' 時出錯: 結束狀態 %d\n"
+msgstr ""
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, c-format
msgid "error running '%s': terminated\n"
-msgstr "執行 '%s' 時出錯: 已終止\n"
+msgstr ""
+#: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
#, c-format
msgid "error getting exit code of process %d: %s\n"
-msgstr "取得 %d 執行程序結束碼時出錯: %s\n"
+msgstr ""
+#: common/exechelp-w32ce.c:767
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
-msgstr "等候 %d 處理程序終止時失敗: %s\n"
+msgstr ""
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, c-format
msgid "can't connect to '%s': %s\n"
-msgstr "無法連接至 '%s': %s\n"
+msgstr ""
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr ""
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
msgid "problem setting the gpg-agent options\n"
-msgstr "設定 gpg-agent 選項時發生問題\n"
+msgstr ""
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- msgid "canceled by user\n"
- msgstr ""
-
- #: common/simple-pwquery.c:579
- msgid "problem with the agent\n"
- msgstr ""
-
- #: common/simple-pwquery.c:701
- #, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr ""
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
-msgstr "無法讓系統停止傾印核心檔: %s\n"
+msgstr ""
+#: common/sysutils.c:219
#, c-format
msgid "Warning: unsafe ownership on %s \"%s\"\n"
-msgstr "警告: %s 的所有權 \"%s\" 並不安全\n"
+msgstr ""
+#: common/sysutils.c:251
#, c-format
msgid "Warning: unsafe permissions on %s \"%s\"\n"
-msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:45 common/yesno.c:82
msgid "yes"
-msgstr "yes"
+msgstr ""
+#: common/yesno.c:46 common/yesno.c:87
msgid "yY"
-msgstr "yY"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:48 common/yesno.c:84
msgid "no"
-msgstr "no"
+msgstr ""
+#: common/yesno.c:49 common/yesno.c:88
msgid "nN"
-msgstr "nN"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:86
msgid "quit"
-msgstr "quit"
+msgstr ""
+#: common/yesno.c:89
msgid "qQ"
-msgstr "qQ"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:123
msgid "okay|okay"
-msgstr "okay|okay"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:125
msgid "cancel|cancel"
-msgstr "cancel|cancel"
+msgstr ""
+#: common/yesno.c:126
msgid "oO"
-msgstr "oO"
+msgstr ""
+#: common/yesno.c:127
msgid "cC"
-msgstr "cC"
+msgstr ""
+#: common/miscellaneous.c:86
#, c-format
msgid "out of core in secure memory while allocating %lu bytes"
-msgstr "在安全記憶體配置 %lu 位元組時超出核心"
+msgstr ""
+#: common/miscellaneous.c:89
#, c-format
msgid "out of core while allocating %lu bytes"
-msgstr "配置 %lu 位元組時超出核心"
+msgstr ""
+#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
-msgstr "配置足夠的記憶體時出錯: %s\n"
+msgstr ""
+#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr "%s:%u: 廢棄的 \"%s\" 選項 - 沒有任何影響\n"
+msgstr ""
+#: common/miscellaneous.c:146
#, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "警告: \"%s%s\" 是已廢棄的選項 - 沒有效果\n"
+msgstr ""
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
+#: common/asshelp.c:417
#, c-format
msgid "no running gpg-agent - starting '%s'\n"
-msgstr "沒有執行中的 gpg-agent - 正在啟動 '%s'\n"
+msgstr ""
+#: common/asshelp.c:477
#, c-format
msgid "waiting for the agent to come up ... (%ds)\n"
-msgstr "正在等候代理程式出現 ... (%d 秒)\n"
+msgstr ""
+#: common/asshelp.c:485
msgid "connection to agent established\n"
-msgstr "至代理程式的連線已建立\n"
+msgstr ""
-#, fuzzy
-#| msgid "connection to agent established\n"
+#: common/asshelp.c:525
msgid "connection to agent is in restricted mode\n"
-msgstr "至代理程式的連線已建立\n"
+msgstr ""
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
-msgstr "沒有執行中的 Dirmngr - 正在啟動 '%s'\n"
+msgstr ""
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
-msgstr "正在等候 dirmngr 出現 ... (%d 秒)\n"
+msgstr ""
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
-msgstr "連線至 dirmngr 已建立\n"
+msgstr ""
#. TRANSLATORS: Copy the prefix between the vertical bars
#. verbatim. It will not be printed.
+#: common/audit.c:474
msgid "|audit-log-result|Good"
-msgstr "|audit-log-result|良好"
+msgstr ""
+#: common/audit.c:477
msgid "|audit-log-result|Bad"
-msgstr "|audit-log-result|不良"
+msgstr ""
+#: common/audit.c:479
msgid "|audit-log-result|Not supported"
-msgstr "|audit-log-result|不支援"
+msgstr ""
+#: common/audit.c:481
msgid "|audit-log-result|No certificate"
-msgstr "|audit-log-result|沒有憑證"
+msgstr ""
+#: common/audit.c:483
msgid "|audit-log-result|Not enabled"
-msgstr "|audit-log-result|未啟用"
+msgstr ""
+#: common/audit.c:485
msgid "|audit-log-result|Error"
-msgstr "|audit-log-result|錯誤"
+msgstr ""
+#: common/audit.c:487
msgid "|audit-log-result|Not used"
-msgstr "|audit-log-result|未使用"
+msgstr ""
+#: common/audit.c:489
msgid "|audit-log-result|Okay"
-msgstr "|audit-log-result|沒問題"
+msgstr ""
+#: common/audit.c:491
msgid "|audit-log-result|Skipped"
-msgstr "|audit-log-result|已跳過"
+msgstr ""
+#: common/audit.c:493
msgid "|audit-log-result|Some"
-msgstr "|audit-log-result|有些"
+msgstr ""
+#: common/audit.c:726
msgid "Certificate chain available"
-msgstr "有可用的憑證鏈"
+msgstr ""
+#: common/audit.c:733
msgid "root certificate missing"
-msgstr "根憑證遺失"
+msgstr ""
+#: common/audit.c:759
msgid "Data encryption succeeded"
-msgstr "資料已加密成功"
+msgstr ""
+#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
msgid "Data available"
-msgstr "有可用的資料"
+msgstr ""
+#: common/audit.c:767
msgid "Session key created"
-msgstr "階段金鑰已建立"
+msgstr ""
+#: common/audit.c:772 common/audit.c:912 common/audit.c:919
#, c-format
msgid "algorithm: %s"
-msgstr "演算法: %s"
+msgstr ""
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
+#: scd/app-openpgp.c:2885
#, c-format
msgid "unsupported algorithm: %s"
-msgstr "未支援的演算法: %s"
+msgstr ""
+#: common/audit.c:778 common/audit.c:925
msgid "seems to be not encrypted"
-msgstr "看起來未加密"
+msgstr ""
+#: common/audit.c:784 common/audit.c:933
msgid "Number of recipients"
-msgstr "收件者數量"
+msgstr ""
+#: common/audit.c:792 common/audit.c:956
#, c-format
msgid "Recipient %d"
-msgstr "收件者 %d"
+msgstr ""
+#: common/audit.c:825
msgid "Data signing succeeded"
-msgstr "資料已簽署成功"
+msgstr ""
+#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
#, c-format
msgid "data hash algorithm: %s"
-msgstr "資料雜湊演算法: %s"
+msgstr ""
+#: common/audit.c:862
#, c-format
msgid "Signer %d"
-msgstr "簽署者 %d"
+msgstr ""
+#: common/audit.c:866 common/audit.c:1065
#, c-format
msgid "attr hash algorithm: %s"
-msgstr "屬性雜湊演算法: %s"
+msgstr ""
+#: common/audit.c:901
msgid "Data decryption succeeded"
-msgstr "資料已解密成功"
+msgstr ""
+#: common/audit.c:910
msgid "Encryption algorithm supported"
-msgstr "支援的加密演算法"
+msgstr ""
+#: common/audit.c:993
msgid "Data verification succeeded"
-msgstr "資料驗證成功"
+msgstr ""
+#: common/audit.c:1002
msgid "Signature available"
-msgstr "有可用的簽章"
+msgstr ""
+#: common/audit.c:1024
msgid "Parsing data succeeded"
-msgstr "剖析資料成功"
+msgstr ""
+#: common/audit.c:1036
#, c-format
msgid "bad data hash algorithm: %s"
-msgstr "不良的資料雜湊演算法: %s"
+msgstr ""
+#: common/audit.c:1051
#, c-format
msgid "Signature %d"
-msgstr "簽章 %d"
+msgstr ""
+#: common/audit.c:1079
msgid "Certificate chain valid"
-msgstr "憑證鏈有效"
+msgstr ""
+#: common/audit.c:1090
msgid "Root certificate trustworthy"
-msgstr "根憑證可信賴"
+msgstr ""
+#: common/audit.c:1111 sm/certchain.c:991
msgid "no CRL found for certificate"
-msgstr "找不到用於憑證的 CRL"
+msgstr ""
+#: common/audit.c:1114 sm/certchain.c:1001
msgid "the available CRL is too old"
-msgstr "可用的 CRL 太舊了"
+msgstr ""
+#: common/audit.c:1119
msgid "CRL/OCSP check of certificates"
-msgstr "CRL/OCSP 憑證檢查"
+msgstr ""
+#: common/audit.c:1139
msgid "Included certificates"
-msgstr "包含在內的憑證"
+msgstr ""
+#: common/audit.c:1194
msgid "No audit log entries."
-msgstr "沒有稽核日誌項目."
+msgstr ""
+#: common/audit.c:1243
msgid "Unknown operation"
-msgstr "未知的操作"
+msgstr ""
+#: common/audit.c:1261
msgid "Gpg-Agent usable"
-msgstr "Gpg-Agent 可以使用"
+msgstr ""
+#: common/audit.c:1271
msgid "Dirmngr usable"
-msgstr "Dirmngr 可以使用"
+msgstr ""
+#: common/audit.c:1307
#, c-format
msgid "No help available for '%s'."
-msgstr "'%s' 沒有可用的說明."
+msgstr ""
+#: common/helpfile.c:90
msgid "ignoring garbage line"
-msgstr "忽略垃圾列"
+msgstr ""
+#: common/gettime.c:893
msgid "[none]"
-msgstr "[ 無 ]"
+msgstr ""
+#: common/argparse.c:365
msgid "argument not expected"
-msgstr "沒料到有引數"
+msgstr ""
+#: common/argparse.c:367
msgid "read error"
-msgstr "讀取錯誤"
+msgstr ""
+#: common/argparse.c:369
msgid "keyword too long"
-msgstr "關鍵字太長"
+msgstr ""
+#: common/argparse.c:371
msgid "missing argument"
-msgstr "無效的引數"
+msgstr ""
+#: common/argparse.c:373
msgid "invalid argument"
-msgstr "無效的引數"
+msgstr ""
+#: common/argparse.c:375
msgid "invalid command"
-msgstr "無效的指令"
+msgstr ""
+#: common/argparse.c:377
msgid "invalid alias definition"
-msgstr "無效的別名定義"
+msgstr ""
+#: common/argparse.c:379
msgid "out of core"
-msgstr "超出核心"
+msgstr ""
+#: common/argparse.c:381
msgid "invalid option"
-msgstr "無效的選項"
+msgstr ""
+#: common/argparse.c:389
#, c-format
msgid "missing argument for option \"%.50s\"\n"
-msgstr "\"%.50s\" 選項遺失了引數\n"
+msgstr ""
+#: common/argparse.c:391
#, c-format
msgid "invalid argument for option \"%.50s\"\n"
-msgstr "選項 \"%.50s\" 的引數無效\n"
+msgstr ""
+#: common/argparse.c:393
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
-msgstr "\"%.50s\" 選項沒料到會有引數\n"
+msgstr ""
+#: common/argparse.c:395
#, c-format
msgid "invalid command \"%.50s\"\n"
-msgstr "無效的指令 \"%.50s\"\n"
+msgstr ""
+#: common/argparse.c:397
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
-msgstr "\"%.50s\" 選項不明確\n"
+msgstr ""
+#: common/argparse.c:399
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
-msgstr "\"%.50s\" 指令不明確\n"
+msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
msgid "out of core\n"
-msgstr "超出核心\n"
+msgstr ""
+#: common/argparse.c:403
#, c-format
msgid "invalid option \"%.50s\"\n"
-msgstr "無效的選項 \"%.50s\"\n"
+msgstr ""
+#: common/utf8conv.c:123
#, c-format
msgid "conversion from '%s' to '%s' not available\n"
-msgstr "沒有從 '%s' 到 '%s' 之間的轉換可用\n"
+msgstr ""
+#: common/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
-msgstr "iconv_open 失敗: %s\n"
+msgstr ""
+#: common/utf8conv.c:385 common/utf8conv.c:651
#, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
-msgstr "從 '%s' 轉換到 '%s' 失敗: %s\n"
+msgstr ""
+#: common/dotlock.c:707
#, c-format
msgid "failed to create temporary file '%s': %s\n"
-msgstr "建立暫存檔失敗 '%s': %s\n"
+msgstr ""
+#: common/dotlock.c:771
#, c-format
msgid "error writing to '%s': %s\n"
-msgstr "寫入 '%s' 時出錯: %s\n"
+msgstr ""
+#: common/dotlock.c:1116
#, c-format
msgid "removing stale lockfile (created by %d)\n"
-msgstr "正在移除陳腐的鎖定檔 (由 %d 所建立)\n"
+msgstr ""
+#: common/dotlock.c:1152
#, c-format
msgid "waiting for lock (held by %d%s) %s...\n"
-msgstr "正在等候鎖定 (被 %d%s 持有) %s...\n"
+msgstr ""
+#: common/dotlock.c:1153
msgid "(deadlock?) "
-msgstr "(死結嗎?) "
+msgstr ""
+#: common/dotlock.c:1192
#, c-format
msgid "lock '%s' not made: %s\n"
-msgstr "未鎖定 '%s': %s\n"
+msgstr ""
+#: common/dotlock.c:1219
#, c-format
msgid "waiting for lock %s...\n"
-msgstr "正在等候 `%s' 鎖定...\n"
+msgstr ""
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
-msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
++msgstr ""
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
-msgstr "封裝: %s\n"
+msgstr ""
+#: g10/armor.c:463
msgid "invalid armor header: "
-msgstr "無效的封裝檔頭: "
+msgstr ""
+#: g10/armor.c:474
msgid "armor header: "
-msgstr "封裝檔頭: "
+msgstr ""
+#: g10/armor.c:487
msgid "invalid clearsig header\n"
-msgstr "無效的明文簽章檔頭\n"
+msgstr ""
+#: g10/armor.c:500
msgid "unknown armor header: "
-msgstr "未知的封裝檔頭: "
+msgstr ""
+#: g10/armor.c:553
msgid "nested clear text signatures\n"
-msgstr "多層明文簽章\n"
+msgstr ""
+#: g10/armor.c:688
msgid "unexpected armor: "
-msgstr "未預期的封裝: "
+msgstr ""
+#: g10/armor.c:701
msgid "invalid dash escaped line: "
-msgstr "無效的破折號逸出列: "
+msgstr ""
+#: g10/armor.c:873 g10/armor.c:1490
#, c-format
msgid "invalid radix64 character %02X skipped\n"
-msgstr "無效的 64 進位字符 %02x 已跳過\n"
+msgstr ""
+#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
-msgstr "檔案未預期的結束 (沒有 CRC 的部分)\n"
+msgstr ""
+#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
-msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
+msgstr ""
+#: g10/armor.c:958
msgid "malformed CRC\n"
-msgstr "格式不對的 CRC\n"
+msgstr ""
+#: g10/armor.c:962 g10/armor.c:1527
#, c-format
msgid "CRC error; %06lX - %06lX\n"
-msgstr "CRC 錯誤; %06lX - %06lX\n"
+msgstr ""
+#: g10/armor.c:982
msgid "premature eof (in trailer)\n"
-msgstr "檔案未預期的結束 (於結尾處)\n"
+msgstr ""
+#: g10/armor.c:986
msgid "error in trailer line\n"
-msgstr "結尾列有問題\n"
+msgstr ""
+#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
-msgstr "找不到有效的 OpenPGP 資料.\n"
+msgstr ""
+#: g10/armor.c:1308
#, c-format
msgid "invalid armor: line longer than %d characters\n"
-msgstr "無效的封裝: 列長超出 %d 字符\n"
+msgstr ""
+#: g10/armor.c:1312
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
-msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "not human readable"
+#: g10/build-packet.c:1115
+#, c-format
msgid "[ not human readable (%zu bytes: %s%s) ]"
-msgstr "不是人類能讀得懂的"
+msgstr ""
+#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1504,179 -1189,132 +1485,179 @@@ msgstr "
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
-#, fuzzy, c-format
-#| msgid "WARNING: %s overrides %s\n"
+#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
+#, c-format
msgid "WARNING: %s\n"
-msgstr "警告: %s 會推翻 %s\n"
+msgstr ""
+#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
+#: g10/keygen.c:4883
#, c-format
msgid "OpenPGP card not available: %s\n"
-msgstr "沒有可用的 OpenPGP 卡片: %s\n"
+msgstr ""
+#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
-msgstr "偵測到 OpenPGP 卡片編號 %s\n"
+msgstr ""
+#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
+#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
-msgstr "無法在批次模式中這樣做\n"
+msgstr ""
+#: g10/card-util.c:107
msgid "This command is only available for version 2 cards\n"
-msgstr "祇有第二版卡片纔能用這個指令\n"
+msgstr ""
+#: g10/card-util.c:109 scd/app-openpgp.c:2259
msgid "Reset Code not or not anymore available\n"
-msgstr "(再也) 沒有重設碼\n"
+msgstr ""
+#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
+#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
-msgstr "你要選哪一個? "
+msgstr ""
+#: g10/card-util.c:279 g10/card-util.c:330
msgid "[not set]"
-msgstr "[未設定]"
+msgstr ""
+#: g10/card-util.c:533
msgid "male"
-msgstr "男性"
+msgstr ""
+#: g10/card-util.c:534
msgid "female"
-msgstr "女性"
+msgstr ""
+#: g10/card-util.c:534
msgid "unspecified"
-msgstr "未特定"
+msgstr ""
+#: g10/card-util.c:561
msgid "not forced"
-msgstr "不強迫使用"
+msgstr ""
+#: g10/card-util.c:561
msgid "forced"
-msgstr "強迫使用"
+msgstr ""
+#: g10/card-util.c:636
msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr "錯誤: 目前祇允許使用單純的 ASCII 字符.\n"
+msgstr ""
+#: g10/card-util.c:638
msgid "Error: The \"<\" character may not be used.\n"
-msgstr "錯誤: 不能使用 \"<\" 字符.\n"
+msgstr ""
+#: g10/card-util.c:640
msgid "Error: Double spaces are not allowed.\n"
-msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
+msgstr ""
+#: g10/card-util.c:657
msgid "Cardholder's surname: "
-msgstr "卡片持有者的姓氏: "
+msgstr ""
+#: g10/card-util.c:659
msgid "Cardholder's given name: "
-msgstr "卡片持有者的名字: "
+msgstr ""
+#: g10/card-util.c:677
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
-msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字符).\n"
+msgstr ""
+#: g10/card-util.c:698
msgid "URL to retrieve public key: "
-msgstr "取回公鑰的 URL: "
+msgstr ""
+#: g10/card-util.c:706
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
-msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
+msgstr ""
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, c-format
msgid "error reading '%s': %s\n"
-msgstr "讀取 '%s' 時出錯: %s\n"
+msgstr ""
+#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
-msgstr "寫入 '%s' 時出錯: %s\n"
+msgstr ""
+#: g10/card-util.c:861
msgid "Login data (account name): "
-msgstr "登入資料 (帳號名稱): "
+msgstr ""
+#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
-msgstr "錯誤: 登入資料太長 (上限是 %d 個字符).\n"
+msgstr ""
+#: g10/card-util.c:907
msgid "Private DO data: "
-msgstr "私人的 DO 資料: "
+msgstr ""
+#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
-msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字符).\n"
+msgstr ""
+#: g10/card-util.c:1000
msgid "Language preferences: "
-msgstr "介面語言偏好設定: "
+msgstr ""
+#: g10/card-util.c:1008
msgid "Error: invalid length of preference string.\n"
-msgstr "錯誤: 無效的偏好設定字串長度\n"
+msgstr ""
+#: g10/card-util.c:1017
msgid "Error: invalid characters in preference string.\n"
-msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
+msgstr ""
+#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "性別 ((M)男性, (F)女性或留空): "
+msgstr ""
+#: g10/card-util.c:1053
msgid "Error: invalid response.\n"
-msgstr "錯誤: 無效的回應.\n"
+msgstr ""
+#: g10/card-util.c:1075
msgid "CA fingerprint: "
-msgstr "憑證中心 (CA) 指紋: "
+msgstr ""
+#: g10/card-util.c:1098
msgid "Error: invalid formatted fingerprint.\n"
-msgstr "錯誤: 無效的格式化指紋.\n"
+msgstr ""
+#: g10/card-util.c:1148
#, c-format
msgid "key operation not possible: %s\n"
-msgstr "不可能進行金鑰操作: %s\n"
+msgstr ""
+#: g10/card-util.c:1149
msgid "not an OpenPGP card"
-msgstr "這不是 OpenPGP 卡片"
+msgstr ""
+#: g10/card-util.c:1162
#, c-format
msgid "error getting current key info: %s\n"
-msgstr "取得現用金鑰資訊時出錯: %s\n"
+msgstr ""
+#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
-msgstr "是否要取代既有的金鑰? (y/N) "
+msgstr ""
+#: g10/card-util.c:1266
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"
@@@ -1854,294 -1462,226 +1835,294 @@@ msgstr "
msgid "destroy all keys and data"
msgstr ""
+#: g10/card-util.c:1941
msgid "gpg/card> "
-msgstr "gpg/卡片> "
+msgstr ""
+#: g10/card-util.c:1982
msgid "Admin-only command\n"
-msgstr "限管理者使用的指令\n"
+msgstr ""
+#: g10/card-util.c:2013
msgid "Admin commands are allowed\n"
-msgstr "允許使用管理者指令\n"
+msgstr ""
+#: g10/card-util.c:2015
msgid "Admin commands are not allowed\n"
-msgstr "未允許使用管理者指令\n"
+msgstr ""
+#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
-msgstr "無效的指令 (試試看 \"help\")\n"
+msgstr ""
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
-msgstr "--output 在這個指令中沒有作用\n"
+msgstr ""
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
-msgstr "無法開啟 '%s'\n"
+msgstr ""
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
-msgstr "找不到金鑰 \"%s\": %s\n"
+msgstr ""
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
-msgstr "讀取金鑰區塊時出錯: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "key \"%s\" not found: %s\n"
+#: g10/delkey.c:118 g10/getkey.c:579
+#, c-format
msgid "key \"%s\" not found\n"
-msgstr "找不到金鑰 \"%s\": %s\n"
+msgstr ""
+#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
-msgstr "(除非你用指紋指定了金鑰)\n"
+msgstr ""
+#: g10/delkey.c:135
msgid "can't do this in batch mode without \"--yes\"\n"
-msgstr "沒有 \"--yes\" 就沒辦法在批次模式中這麼做\n"
+msgstr ""
+#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
-msgstr "要從鑰匙圈裡刪除這把金鑰嗎? (y/N) "
+msgstr ""
+#: g10/delkey.c:158
msgid "This is a secret key! - really delete? (y/N) "
-msgstr "這是一把私鑰! - 真的要刪除嗎? (y/N) "
+msgstr ""
+#: g10/delkey.c:201
#, c-format
msgid "deleting secret %s failed: %s\n"
-msgstr "刪除私鑰 %s 時失敗: %s\n"
+msgstr ""
+#: g10/delkey.c:203
msgid "key"
-msgstr "金鑰"
+msgstr ""
+#: g10/delkey.c:203
msgid "subkey"
-msgstr "子鑰"
+msgstr ""
+#: g10/delkey.c:226
#, c-format
msgid "deleting keyblock failed: %s\n"
-msgstr "刪除金鑰區塊時失敗: %s\n"
+msgstr ""
+#: g10/delkey.c:239
msgid "ownertrust information cleared\n"
-msgstr "主觀信任資訊已清除\n"
+msgstr ""
+#: g10/delkey.c:275
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
+msgstr ""
+#: g10/delkey.c:277
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
-msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
+msgstr ""
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
-msgstr "建立密語時出錯: %s\n"
+msgstr ""
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr "因處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
+msgstr ""
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
-msgstr "正在使用 %s 編密法\n"
+msgstr ""
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, c-format
msgid "'%s' already compressed\n"
-msgstr "'%s' 已經被壓縮了\n"
+msgstr ""
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, c-format
msgid "WARNING: '%s' is an empty file\n"
-msgstr "警告: '%s' 是個空檔案\n"
+msgstr ""
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, c-format
msgid "reading from '%s'\n"
-msgstr "正在從 '%s' 讀取\n"
+msgstr ""
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
+msgstr ""
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
-msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設定\n"
+msgstr ""
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
+msgstr ""
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s 已加密給: \"%s\"\n"
+msgstr ""
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
-msgstr "你不能夠將 %s 用於 %s 模式中\n"
+msgstr ""
+#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
-msgstr "%s 已加密的資料\n"
+msgstr ""
+#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
-msgstr "以 %d 未知演算法所加密\n"
+msgstr ""
+#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
-msgstr "警告: 訊息已用對稱式編密法的弱金鑰加密了.\n"
+msgstr ""
+#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
-msgstr "處理已加密封包有問題\n"
+msgstr ""
+#: g10/exec.c:60
msgid "no remote program execution supported\n"
-msgstr "沒有支援的遠端程式執行\n"
+msgstr ""
+#: g10/exec.c:319
msgid ""
"external program calls are disabled due to unsafe options file permissions\n"
-msgstr "因為不安全的檔案權限選項, 而禁用了外部程式叫用\n"
+msgstr ""
+#: g10/exec.c:349
msgid "this platform requires temporary files when calling external programs\n"
-msgstr "在這個作業平台上叫用外部程式時需要暫存檔\n"
+msgstr ""
+#: g10/exec.c:427
#, c-format
msgid "unable to execute program '%s': %s\n"
-msgstr "無法執行程式 '%s': %s\n"
+msgstr ""
+#: g10/exec.c:430
#, c-format
msgid "unable to execute shell '%s': %s\n"
-msgstr "無法執行 shell '%s': %s\n"
+msgstr ""
+#: g10/exec.c:521
#, c-format
msgid "system error while calling external program: %s\n"
-msgstr "叫用外部程式時發生系統錯誤: %s\n"
+msgstr ""
+#: g10/exec.c:532 g10/exec.c:599
msgid "unnatural exit of external program\n"
-msgstr "外部程式不自然地離開\n"
+msgstr ""
+#: g10/exec.c:547
msgid "unable to execute external program\n"
-msgstr "無法執行外部程式\n"
+msgstr ""
+#: g10/exec.c:564
#, c-format
msgid "unable to read external program response: %s\n"
-msgstr "無法讀取外部程式回應: %s\n"
+msgstr ""
+#: g10/exec.c:610 g10/exec.c:617
#, c-format
msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
-msgstr "警告: 無法移除暫存檔 (%s) '%s': %s\n"
+msgstr ""
+#: g10/exec.c:622
#, c-format
msgid "WARNING: unable to remove temp directory '%s': %s\n"
-msgstr "警告: 無法移除暫存目錄 '%s': %s\n"
+msgstr ""
+#: g10/export.c:102
msgid "export signatures that are marked as local-only"
-msgstr "匯出標記為僅限本機使用的簽章"
+msgstr ""
+#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
-msgstr "匯出署名使用者 ID (通常是照片 ID)"
+msgstr ""
+#: g10/export.c:106
msgid "export revocation keys marked as \"sensitive\""
-msgstr "匯出標記為 \"機密\" 的撤銷金鑰"
+msgstr ""
+#: g10/export.c:108
msgid "remove unusable parts from key during export"
-msgstr "匯出時從金鑰中移除無法使用的部分"
+msgstr ""
+#: g10/export.c:110
msgid "remove as much as possible from key during export"
-msgstr "匯出時盡可能地從金鑰中移除"
+msgstr ""
+#: g10/export.c:1204
msgid " - skipped"
-msgstr " - 已跳過"
+msgstr ""
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, c-format
msgid "writing to '%s'\n"
-msgstr "正在寫入 '%s'\n"
+msgstr ""
+#: g10/export.c:1660
#, c-format
msgid "key %s: key material on-card - skipped\n"
-msgstr "金鑰 %s: 金鑰資料在卡片上 - 已跳過\n"
+msgstr ""
+#: g10/export.c:1846
msgid "exporting secret keys not allowed\n"
-msgstr "不允許匯出私鑰\n"
+msgstr ""
+#: g10/export.c:1923
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "金鑰 %s: PGP 2.x 型態的金鑰 - 已跳過\n"
+msgstr ""
+#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
-msgstr "警告: 沒有匯出任何東西\n"
+msgstr ""
+#: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
+#: g10/plaintext.c:151 g10/plaintext.c:174
#, c-format
msgid "error creating '%s': %s\n"
-msgstr "建立 '%s' 時出錯: %s\n"
+msgstr ""
+#: g10/getkey.c:257
msgid "[User ID not found]"
-msgstr "[找不到使用者 ID]"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "missing argument for option \"%.50s\"\n"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
+#, c-format
msgid "(check argument of option '%s')\n"
-msgstr "\"%.50s\" 選項遺失了引數\n"
+msgstr ""
+#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2191,215 -1725,169 +2172,215 @@@ msgstr "
msgid "all values passed to '%s' ignored\n"
msgstr ""
+#: g10/getkey.c:2545
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
+msgstr ""
+#: g10/getkey.c:3377
#, c-format
msgid "using subkey %s instead of primary key %s\n"
-msgstr "使用子鑰 %s 來替換主鑰 %s\n"
+msgstr ""
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
msgid "make a signature"
-msgstr "建立簽章"
+msgstr ""
- #: g10/gpg.c:418
++#: g10/gpg.c:421
msgid "make a clear text signature"
-msgstr "建立明文簽章"
+msgstr ""
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
-msgstr "建立分離式簽章"
+msgstr ""
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
-msgstr "加密資料"
+msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
-msgstr "僅使用對稱式編密法來加密"
+msgstr ""
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
-msgstr "資料解密 (預設)"
+msgstr ""
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
-msgstr "驗證簽章"
+msgstr ""
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
-msgstr "列出金鑰"
+msgstr ""
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
-msgstr "列出金鑰和簽章"
+msgstr ""
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "list and check key signatures"
-msgstr "列出並檢查金鑰簽章"
+msgstr ""
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
-msgstr "列出金鑰和指紋"
+msgstr ""
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
-msgstr "列出私鑰"
+msgstr ""
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
-msgstr "產生新的金鑰對"
+msgstr ""
- #: g10/gpg.c:437
++#: g10/gpg.c:440
msgid "quickly generate a new key pair"
-msgstr "快速產生新的金鑰對"
+msgstr ""
- #: g10/gpg.c:439
-#, fuzzy
-#| msgid "quickly generate a new key pair"
++#: g10/gpg.c:442
msgid "quickly add a new user-id"
-msgstr "快速產生新的金鑰對"
+msgstr ""
- #: g10/gpg.c:442
-#, fuzzy
-#| msgid "quickly generate a new key pair"
++#: g10/gpg.c:445
msgid "quickly revoke a user-id"
-msgstr "快速產生新的金鑰對"
+msgstr ""
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
-msgstr "全能金鑰對生成"
+msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
-msgstr "產生撤銷憑證"
+msgstr ""
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
-msgstr "從公鑰鑰匙圈裡移除金鑰"
+msgstr ""
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
-msgstr "從私鑰鑰匙圈裡移除金鑰"
+msgstr ""
- #: g10/gpg.c:451
++#: g10/gpg.c:454
msgid "quickly sign a key"
-msgstr "快速簽署金鑰"
+msgstr ""
- #: g10/gpg.c:453
++#: g10/gpg.c:456
msgid "quickly sign a key locally"
-msgstr "快速在本機簽署金鑰"
+msgstr ""
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
-msgstr "簽署金鑰"
+msgstr ""
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
-msgstr "僅在本機簽署金鑰"
+msgstr ""
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
-msgstr "簽署或編輯金鑰"
+msgstr ""
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
msgid "change a passphrase"
-msgstr "更改密語"
+msgstr ""
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
-msgstr "匯出金鑰"
+msgstr ""
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
-msgstr "把金鑰匯出至金鑰伺服器"
+msgstr ""
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
-msgstr "從金鑰伺服器匯入金鑰"
+msgstr ""
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
-msgstr "在金鑰伺服器上搜尋金鑰"
+msgstr ""
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
-msgstr "從金鑰伺服器更新所有的金鑰"
+msgstr ""
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
-msgstr "匯入/合併金鑰"
+msgstr ""
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
-msgstr "列印卡片狀態"
+msgstr ""
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
-msgstr "變更卡片上的資料"
+msgstr ""
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
-msgstr "變更卡片的個人識別碼 (PIN)"
+msgstr ""
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
-msgstr "更新信任資料庫"
+msgstr ""
- #: g10/gpg.c:498
++#: g10/gpg.c:501
msgid "print message digests"
-msgstr "印出訊息摘要"
+msgstr ""
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
-msgstr "以伺服器模式執行"
+msgstr ""
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
-msgstr "建立以 ASCII 封裝過的輸出"
+msgstr ""
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|使用者-ID|以指定使用者 ID 作為加密對象"
+msgstr ""
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
+msgstr ""
- #: g10/gpg.c:531
++#: g10/gpg.c:535
msgid "|N|set compress level to N (0 disables)"
-msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
+msgstr ""
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
-msgstr "使用標準的文字模式"
+msgstr ""
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
-msgstr "|檔案|將輸出寫入至指定檔案"
+msgstr ""
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
-msgstr "不要做任何改變"
+msgstr ""
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
-msgstr "覆寫前先詢問"
+msgstr ""
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
-msgstr "使用嚴謹的 OpenPGP 行為"
+msgstr ""
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-"@\n"
-"(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2410,613 -1898,492 +2391,608 @@@
" --list-keys [names] show keys\n"
" --fingerprint [names] show fingerprints\n"
msgstr ""
-"@\n"
-"範例:\n"
-"\n"
-" -se -r Bob [檔案] 對 Bob 這個使用者簽署及加密\n"
-" --clearsign [檔案] 做出明文簽章\n"
-" --detach-sign [檔案] 做出分離式簽章\n"
-" --list-keys [名字] 顯示金鑰\n"
-" --fingerprint [名字] 顯示指紋\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
msgid "Usage: @GPG@ [options] [files] (-h for help)"
-msgstr "用法: @GPG@ [選項] [檔案] (或用 -h 求助)"
+msgstr ""
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
"Default operation depends on the input data\n"
msgstr ""
-"語法: @GPG@ [選項] [檔案]\n"
-"簽署, 檢查, 加密, 解密\n"
-"預設的操作會依輸入資料而定\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
msgstr ""
-"\n"
-"已支援的演算法:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
-msgstr "公鑰: "
+msgstr ""
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
-msgstr "編密法: "
+msgstr ""
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
-msgstr "雜湊: "
+msgstr ""
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
-msgstr "壓縮: "
+msgstr ""
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
-msgstr "用法: %s [選項] %s\n"
+msgstr ""
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
-msgstr "指令彼此矛盾\n"
+msgstr ""
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, c-format
msgid "no = sign found in group definition '%s'\n"
-msgstr "在群組定義 '%s' 裡找不到 = 記號\n"
+msgstr ""
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
-msgstr "警告: 家目錄 '%s' 的所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
-msgstr "警告: 組態檔案 '%s' 的所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
-msgstr "警告: 延伸模組 '%s' 的所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
-msgstr "警告: 家目錄 '%s' 的權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
-msgstr "警告: 組態檔案 '%s' 的權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
-msgstr "警告: 延伸模組 '%s' 的權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
-msgstr "警告: 家目錄 '%s' 的封入目錄所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
-msgstr "警告: 組態檔案 '%s' 的封入目錄所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
-msgstr "警告: 延伸模組 '%s' 的封入目錄所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
-msgstr "警告: 家目錄 '%s' 的封入目錄權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
-msgstr "警告: 組態檔案 '%s' 的封入目錄權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
-msgstr "警告: 延伸模組 '%s' 的封入目錄權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, c-format
msgid "unknown configuration item '%s'\n"
-msgstr "未知的組態項目 '%s'\n"
+msgstr ""
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
-msgstr "列出金鑰時顯示照片 ID"
+msgstr ""
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
msgid "show key usage information during key listings"
-msgstr "列出金鑰時顯示金鑰用途資訊"
+msgstr ""
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
-msgstr "列出簽章時顯示原則 URL"
+msgstr ""
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
msgid "show all notations during signature listings"
-msgstr "列出簽章時顯示所有的註記"
+msgstr ""
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
-msgstr "列出簽章時顯示 IETF 標準註記"
+msgstr ""
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
-msgstr "列出簽章時顯示使用者提供的註記"
+msgstr ""
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
msgid "show preferred keyserver URLs during signature listings"
-msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
+msgstr ""
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
-msgstr "列出金鑰時顯示使用者 ID 有效性"
+msgstr ""
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
-msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
+msgstr ""
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
-msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
+msgstr ""
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
msgid "show the keyring name in key listings"
-msgstr "在金鑰清單中顯示鑰匙圈名稱"
+msgstr ""
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
msgid "show expiration dates during signature listings"
-msgstr "列出簽章時顯示有效期限"
+msgstr ""
- #: g10/gpg.c:2006
-#, fuzzy
-#| msgid "Available keys:\n"
++#: g10/gpg.c:2011
msgid "available TOFU policies:\n"
-msgstr "可用金鑰:\n"
+msgstr ""
- #: g10/gpg.c:2017
-#, fuzzy, c-format
-#| msgid "unknown option '%s'\n"
++#: g10/gpg.c:2022
+#, c-format
msgid "unknown TOFU policy '%s'\n"
-msgstr "未知的選項 '%s'\n"
+msgstr ""
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr ""
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, c-format
msgid "Note: old default options file '%s' ignored\n"
-msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
+msgstr ""
- #: g10/gpg.c:2208
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
+ msgid "Note: %s is not for normal use!\n"
-msgstr "請注意: 一般情況下不採用 %s!\n"
+msgstr ""
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, c-format
- msgid "Note: %s is not for normal use!\n"
+ msgid "'%s' is not a valid signature expiration\n"
-msgstr "'%s' 不是有效的簽章使用期限\n"
+msgstr ""
- #: g10/gpg.c:2907 g10/gpg.c:2919
-#, fuzzy, c-format
-#| msgid "line %d: not a valid email address\n"
++#: g10/gpg.c:2917
+#, c-format
- msgid "'%s' is not a valid signature expiration\n"
+ msgid "\"%s\" is not a proper mail address\n"
-msgstr "第 %d 列: 不是有效的電子郵件地址\n"
+msgstr ""
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, c-format
msgid "invalid pinentry mode '%s'\n"
-msgstr "無效的個人識別碼項目模式 '%s'\n"
+msgstr ""
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, c-format
msgid "'%s' is not a valid character set\n"
-msgstr "'%s' 不是有效的字元集\n"
+msgstr ""
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
-msgstr "無法剖析金鑰伺服器 URL\n"
+msgstr ""
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, c-format
msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: 無效的金鑰伺服器選項\n"
+msgstr ""
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
msgid "invalid keyserver options\n"
-msgstr "無效的金鑰伺服器選項\n"
+msgstr ""
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
-msgstr "%s:%d: 無效的匯入選項\n"
+msgstr ""
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
-msgstr "無效的匯入選項\n"
+msgstr ""
- #: g10/gpg.c:3072 g10/gpg.c:3087
-#, fuzzy, c-format
-#| msgid "invalid list options\n"
++#: g10/gpg.c:3061 g10/gpg.c:3076
+#, c-format
msgid "invalid filter option: %s\n"
-msgstr "無效的清單選項\n"
+msgstr ""
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
-msgstr "%s:%d: 無效的匯出選項\n"
+msgstr ""
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
-msgstr "無效的匯出選項\n"
+msgstr ""
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, c-format
msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: 無效的清單選項\n"
+msgstr ""
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
msgid "invalid list options\n"
-msgstr "無效的清單選項\n"
+msgstr ""
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
-msgstr "驗證簽章時顯示照片 ID"
+msgstr ""
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
-msgstr "驗證簽章時顯示原則 URL"
+msgstr ""
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
msgid "show all notations during signature verification"
-msgstr "驗證簽章時顯示所有的註記"
+msgstr ""
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
-msgstr "驗證簽章時顯示 IETF 標準註記"
+msgstr ""
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
-msgstr "驗證簽章時顯示使用者提供的註記"
+msgstr ""
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
msgid "show preferred keyserver URLs during signature verification"
-msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
+msgstr ""
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
msgid "show user ID validity during signature verification"
-msgstr "驗證簽章時顯示使用者 ID 有效性"
+msgstr ""
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
-msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
+msgstr ""
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
msgid "show only the primary user ID in signature verification"
-msgstr "驗證簽章時祇顯示主要的使用者 ID"
+msgstr ""
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
-msgstr "以 PKA 資料驗證簽章"
+msgstr ""
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
-msgstr "提高對持有有效 PKA 資料之簽章的信任"
+msgstr ""
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, c-format
msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: 無效的驗證選項\n"
+msgstr ""
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
msgid "invalid verify options\n"
-msgstr "無效的驗證選項\n"
+msgstr ""
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
-msgstr "無法把執行檔路徑設成 %s\n"
+msgstr ""
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
-msgstr "%s:%d: 無效的自動金鑰定址清單\n"
+msgstr ""
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
-msgstr "無效的自動金鑰定址清單\n"
+msgstr ""
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
-msgstr "警告: 程式可能會傾印出核心檔!\n"
+msgstr ""
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
-msgstr "警告: %s 會推翻 %s\n"
+msgstr ""
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
-msgstr "%s 不允許跟 %s 併用!\n"
+msgstr ""
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
-msgstr "%s 跟 %s 放在一起沒有意義!\n"
+msgstr ""
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
-msgstr "警告: 正在偽造的系統時間中執行: "
+msgstr ""
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, c-format
msgid "will not run with insecure memory due to %s\n"
-msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
+msgstr ""
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
-msgstr "所選的編密演算法無效\n"
+msgstr ""
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
-msgstr "所選的摘要演算法無效\n"
+msgstr ""
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
msgid "selected compression algorithm is invalid\n"
-msgstr "所選的壓縮演算法無效\n"
+msgstr ""
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
-msgstr "所選的憑證摘要演算法無效\n"
+msgstr ""
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
-msgstr "completes-needed 一定要大於 0\n"
+msgstr ""
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
-msgstr "marginals-needed 一定要大於 1\n"
+msgstr ""
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
msgid "max-cert-depth must be in the range from 1 to 255\n"
-msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
+msgstr ""
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
+msgstr ""
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
-msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
+msgstr ""
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
-msgstr "請注意: 強烈不建議使用單純 S2K 模式 (0)\n"
+msgstr ""
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
-msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
+msgstr ""
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
-msgstr "無效的預設偏好\n"
+msgstr ""
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
-msgstr "無效的個人編密法偏好\n"
+msgstr ""
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
-msgstr "無效的個人摘要偏好\n"
+msgstr ""
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
-msgstr "無效的個人壓縮偏好\n"
+msgstr ""
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
-msgstr "%s 還沒辦法跟 %s 一起運作\n"
+msgstr ""
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
-msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
+msgstr ""
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
-msgstr "你不該將 '%s' 摘要演算法用於 %s 模式\n"
+msgstr ""
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
-msgstr "你不該將 '%s' 壓縮演算法用於 %s 模式\n"
+msgstr ""
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
-msgstr "信任資料庫啟始失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
+msgstr ""
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
-msgstr "--store [檔名]"
+msgstr ""
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
-msgstr "--symmetric [檔名]"
+msgstr ""
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
-msgstr "'%s' 對稱式加密失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
-msgstr "--encrypt [檔名]"
+msgstr ""
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
msgid "--symmetric --encrypt [filename]"
-msgstr "--symmetric --encrypt [檔名]"
+msgstr ""
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
+msgstr ""
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
-msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
+msgstr ""
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
-msgstr "--sign [檔名]"
+msgstr ""
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
-msgstr "--sign --encrypt [檔名]"
+msgstr ""
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
msgid "--symmetric --sign --encrypt [filename]"
-msgstr "--symmetric --sign --encrypt [檔名]"
+msgstr ""
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
-msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
+msgstr ""
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
+msgstr ""
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
-msgstr "--sign --symmetric [檔名]"
+msgstr ""
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
-msgstr "--clearsign [檔名]"
+msgstr ""
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
-msgstr "--decrypt [檔名]"
+msgstr ""
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
-msgstr "--sign-key 使用者ID"
+msgstr ""
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
-msgstr "--lsign-key 使用者ID"
+msgstr ""
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
-msgstr "--edit-key 使用者ID [指令]"
+msgstr ""
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
msgid "--passwd <user-id>"
-msgstr "--passwd 使用者ID"
+msgstr ""
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
-msgstr "送至金鑰伺服器失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
-msgstr "從金鑰伺服器接收失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
-msgstr "金鑰匯出失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4343
-#, fuzzy, c-format
-#| msgid "key export failed: %s\n"
++#: g10/gpg.c:4332
+#, c-format
msgid "export as ssh key failed: %s\n"
-msgstr "金鑰匯出失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
-msgstr "用金鑰伺服器搜尋失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
-msgstr "從金鑰伺服器更新失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
-msgstr "解開封裝失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
-msgstr "進行封裝失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, c-format
msgid "invalid hash algorithm '%s'\n"
-msgstr "無效的雜湊演算法 '%s'\n"
+msgstr ""
- #: g10/gpg.c:4682
-#, fuzzy, c-format
-#| msgid "error loading certificate '%s': %s\n"
++#: g10/gpg.c:4671
+#, c-format
msgid "error parsing key specification '%s': %s\n"
-msgstr "載入憑證 '%s' 時出錯: %s\n"
+msgstr ""
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
-msgstr "[檔名]"
+msgstr ""
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
-msgstr "請開始輸入你的訊息 ...\n"
+msgstr ""
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
-msgstr "給定的的憑證原則 URL 無效\n"
+msgstr ""
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
-msgstr "給定的簽章原則 URL 無效\n"
+msgstr ""
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
msgid "the given preferred keyserver URL is invalid\n"
-msgstr "給定的偏好金鑰伺服器 URL 無效\n"
+msgstr ""
+#: g10/gpgv.c:75
msgid "|FILE|take the keys from the keyring FILE"
-msgstr "|檔案|從指定鑰匙圈檔案裡取用金鑰"
+msgstr ""
+#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
-msgstr "僅把時間戳印矛盾視為警告"
+msgstr ""
+#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
-msgstr "|檔案描述|把狀態資訊寫入此指定檔案描述"
+msgstr ""
+#: g10/gpgv.c:83
msgid "|ALGO|reject signatures made with ALGO"
msgstr ""
@@@ -3029,333 -2394,272 +3005,333 @@@ msgid "
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
-"語法: gpgv [選項] [檔案]\n"
-"用已知的受信任金鑰來檢查簽章\n"
+#: g10/helptext.c:72
msgid "No help available"
-msgstr "沒有可用的說明"
+msgstr ""
+#: g10/helptext.c:82
#, c-format
msgid "No help available for '%s'"
-msgstr "'%s' 沒有可用的說明"
+msgstr ""
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
-msgstr "匯入標記為僅限本機使用的簽章"
+msgstr ""
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
-msgstr "匯入時修復來自 pks 金鑰伺服器的損壞"
+msgstr ""
- #: g10/import.c:140
-#, fuzzy
-#| msgid "do not update the trustdb after import"
++#: g10/import.c:144
msgid "do not clear the ownertrust values during import"
-msgstr "匯入後不要更新信任資料庫"
+msgstr ""
- #: g10/import.c:143
++#: g10/import.c:147
msgid "do not update the trustdb after import"
-msgstr "匯入後不要更新信任資料庫"
+msgstr ""
- #: g10/import.c:146
-#, fuzzy
-#| msgid "show key fingerprint"
++#: g10/import.c:150
msgid "show key during import"
-msgstr "顯示金鑰指紋"
+msgstr ""
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
-msgstr "祇接受既有金鑰的更新"
+msgstr ""
- #: g10/import.c:152
++#: g10/import.c:156
msgid "remove unusable parts from key after import"
-msgstr "匯入後從金鑰中移除無法使用的部分"
+msgstr ""
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
-msgstr "匯入後盡可能地從金鑰中移除"
+msgstr ""
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
-msgstr "正在跳過 %d 型態的區塊\n"
+msgstr ""
- #: g10/import.c:536
++#: g10/import.c:542
#, c-format
msgid "%lu keys processed so far\n"
-msgstr "目前已處理 %lu 把金鑰\n"
+msgstr ""
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
-msgstr "處理總量: %lu\n"
+msgstr ""
- #: g10/import.c:609
-#, fuzzy, c-format
-#| msgid " skipped new keys: %lu\n"
++#: g10/import.c:615
+#, c-format
msgid " skipped PGP-2 keys: %lu\n"
-msgstr " 已跳過的新金鑰: %lu\n"
+msgstr ""
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
-msgstr " 已跳過的新金鑰: %lu\n"
+msgstr ""
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
-msgstr " 沒有使用者的 ID: %lu\n"
+msgstr ""
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
-msgstr " 已匯入: %lu"
+msgstr ""
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
-msgstr " 未改變的: %lu\n"
+msgstr ""
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
-msgstr " 新的使用者 ID: %lu\n"
+msgstr ""
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
-msgstr " 新的子鑰: %lu\n"
+msgstr ""
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
-msgstr " 新的簽章: %lu\n"
+msgstr ""
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
-msgstr " 新的金鑰撤銷: %lu\n"
+msgstr ""
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
-msgstr " 已讀取的私鑰: %lu\n"
+msgstr ""
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
-msgstr " 已匯入的私鑰: %lu\n"
+msgstr ""
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
-msgstr " 未改變的私鑰: %lu\n"
+msgstr ""
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
-msgstr " 未被匯入: %lu\n"
+msgstr ""
- #: g10/import.c:639
++#: g10/import.c:645
#, c-format
msgid " signatures cleaned: %lu\n"
-msgstr " 已清除的簽章: %lu\n"
+msgstr ""
- #: g10/import.c:641
++#: g10/import.c:647
#, c-format
msgid " user IDs cleaned: %lu\n"
-msgstr " 已清除的使用者 ID: %lu\n"
+msgstr ""
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
-msgstr "警告: 金鑰 %s 的偏好設定含有這些使用者 ID 無法使用的演算法:\n"
+msgstr ""
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
-msgstr " \"%s\": 編密演算法 %s 的偏好設定\n"
+msgstr ""
- #: g10/import.c:1042
++#: g10/import.c:1048
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
-msgstr " \"%s\": 摘要演算法 %s 的偏好設定\n"
+msgstr ""
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
-msgstr " \"%s\": 壓縮演算法 %s 的偏好設定\n"
+msgstr ""
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
-msgstr "我們強烈建議你更新偏好設定, 並重新\n"
+msgstr ""
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
-msgstr "散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
+msgstr ""
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
-msgstr "你可以像這樣來更新偏好設定: gpg --edit-key %s updpref save\n"
+msgstr ""
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, c-format
msgid "key %s: no user ID\n"
-msgstr "金鑰 %s: 沒有使用者 ID\n"
+msgstr ""
- #: g10/import.c:1233
++#: g10/import.c:1312
#, c-format
msgid "key %s: %s\n"
-msgstr "金鑰 %s: %s\n"
+msgstr ""
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
-msgstr "遭到匯入篩選程式駁回"
+msgstr ""
- #: g10/import.c:1264
++#: g10/import.c:1343
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
+msgstr ""
- #: g10/import.c:1282
++#: g10/import.c:1361
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
-msgstr "金鑰 %s: 已接受非自我簽署的使用者 ID \"%s\"\n"
+msgstr ""
- #: g10/import.c:1292
++#: g10/import.c:1371
#, c-format
msgid "key %s: no valid user IDs\n"
-msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
+msgstr ""
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
-msgstr "這可能肇因於遺失自我簽章所致\n"
+msgstr ""
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, c-format
msgid "key %s: public key not found: %s\n"
-msgstr "金鑰 %s: 找不到公鑰: %s\n"
+msgstr ""
- #: g10/import.c:1353
++#: g10/import.c:1437
#, c-format
msgid "key %s: new key - skipped\n"
-msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
+msgstr ""
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
-msgstr "找不到可寫入的鑰匙圈: %s\n"
+msgstr ""
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, c-format
msgid "error writing keyring '%s': %s\n"
-msgstr "寫入鑰匙圈 '%s' 時出錯: %s\n"
+msgstr ""
- #: g10/import.c:1397
++#: g10/import.c:1481
#, c-format
msgid "key %s: public key \"%s\" imported\n"
-msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
+msgstr ""
- #: g10/import.c:1421
++#: g10/import.c:1505
#, c-format
msgid "key %s: doesn't match our copy\n"
-msgstr "金鑰 %s: 跟我們的副本不吻合\n"
+msgstr ""
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
+msgstr ""
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
-msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
+msgstr ""
- #: g10/import.c:1488
++#: g10/import.c:1572
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
-msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
+msgstr ""
- #: g10/import.c:1491
++#: g10/import.c:1575
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
-msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
+msgstr ""
- #: g10/import.c:1494
++#: g10/import.c:1578
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "金鑰 %s: \"%s\" 1 份新的簽章\n"
+msgstr ""
- #: g10/import.c:1497
++#: g10/import.c:1581
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "金鑰 %s: \"%s\" %d 份新的簽章\n"
+msgstr ""
- #: g10/import.c:1500
++#: g10/import.c:1584
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
-msgstr "金鑰 %s: \"%s\" 1 把新的子鑰\n"
+msgstr ""
- #: g10/import.c:1503
++#: g10/import.c:1587
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
-msgstr "金鑰 %s: \"%s\" %d 把新的子鑰\n"
+msgstr ""
- #: g10/import.c:1506
++#: g10/import.c:1590
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
-msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
+msgstr ""
- #: g10/import.c:1509
++#: g10/import.c:1593
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
-msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
+msgstr ""
- #: g10/import.c:1512
++#: g10/import.c:1596
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
-msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
+msgstr ""
- #: g10/import.c:1515
++#: g10/import.c:1599
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
-msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
+msgstr ""
- #: g10/import.c:1538
++#: g10/import.c:1622
#, c-format
msgid "key %s: \"%s\" not changed\n"
-msgstr "金鑰 %s: \"%s\" 未改變\n"
+msgstr ""
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, c-format
msgid "key %s: secret key imported\n"
-msgstr "金鑰 %s: 私鑰已匯入\n"
+msgstr ""
- #: g10/import.c:1858
++#: g10/import.c:1942
#, c-format
msgid "key %s: secret key already exists\n"
-msgstr "金鑰 %s: 私鑰已存在\n"
+msgstr ""
- #: g10/import.c:1866
++#: g10/import.c:1950
#, c-format
msgid "key %s: error sending to agent: %s\n"
-msgstr "金鑰 %s: 送至代理程式時出錯: %s\n"
+msgstr ""
- #: g10/import.c:1971
++#: g10/import.c:2055
#, c-format
msgid "secret key %s: %s\n"
-msgstr "私鑰 %s: %s\n"
+msgstr ""
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
msgid "importing secret keys not allowed\n"
-msgstr "未允許匯入私鑰\n"
+msgstr ""
- #: g10/import.c:2015
++#: g10/import.c:2099
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
-msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
+msgstr ""
#. TRANSLATORS: For smartcard, each private key on
#. host has a reference (stub) to a smartcard and
@@@ -3367,233 -2671,198 +3343,233 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
-msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
+msgstr ""
- #: g10/import.c:2182
++#: g10/import.c:2275
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
-msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
+msgstr ""
- #: g10/import.c:2215
++#: g10/import.c:2308
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
+msgstr ""
- #: g10/import.c:2291
++#: g10/import.c:2384
#, c-format
msgid "key %s: no user ID for signature\n"
-msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
+msgstr ""
- #: g10/import.c:2308
++#: g10/import.c:2401
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
-msgstr "金鑰 %s: 使用者 ID \"%s\" 用了未支援的公鑰演算法\n"
+msgstr ""
- #: g10/import.c:2310
++#: g10/import.c:2403
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
-msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
+msgstr ""
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, c-format
msgid "key %s: unsupported public key algorithm\n"
-msgstr "金鑰 %s: 未支援的公鑰演算法\n"
+msgstr ""
- #: g10/import.c:2328
++#: g10/import.c:2421
#, c-format
msgid "key %s: invalid direct key signature\n"
-msgstr "金鑰 %s: 無效的直接金鑰簽章\n"
+msgstr ""
- #: g10/import.c:2342
++#: g10/import.c:2435
#, c-format
msgid "key %s: no subkey for key binding\n"
-msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
+msgstr ""
- #: g10/import.c:2355
++#: g10/import.c:2448
#, c-format
msgid "key %s: invalid subkey binding\n"
-msgstr "金鑰 %s: 無效的附帶子鑰\n"
+msgstr ""
- #: g10/import.c:2371
++#: g10/import.c:2464
#, c-format
msgid "key %s: removed multiple subkey binding\n"
-msgstr "金鑰 %s: 多重附帶子鑰已移除\n"
+msgstr ""
- #: g10/import.c:2393
++#: g10/import.c:2486
#, c-format
msgid "key %s: no subkey for key revocation\n"
-msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
+msgstr ""
- #: g10/import.c:2406
++#: g10/import.c:2499
#, c-format
msgid "key %s: invalid subkey revocation\n"
-msgstr "金鑰 %s: 無效的子鑰撤銷\n"
+msgstr ""
- #: g10/import.c:2421
++#: g10/import.c:2514
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
-msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
+msgstr ""
- #: g10/import.c:2463
++#: g10/import.c:2556
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
-msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
+msgstr ""
- #: g10/import.c:2487
++#: g10/import.c:2580
#, c-format
msgid "key %s: skipped subkey\n"
-msgstr "金鑰 %s: 子鑰已跳過\n"
+msgstr ""
- #: g10/import.c:2516
-# here we violate the rfc a bit by still allowing
-# * to import non-exportable signature when we have the
-# * the secret key used to create this signature - it
-# * seems that this makes sense
++#: g10/import.c:2609
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
-msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
+msgstr ""
- #: g10/import.c:2527
++#: g10/import.c:2620
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
-msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
+msgstr ""
- #: g10/import.c:2545
++#: g10/import.c:2638
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
-msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
+msgstr ""
- #: g10/import.c:2559
++#: g10/import.c:2652
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
-msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
+msgstr ""
- #: g10/import.c:2567
++#: g10/import.c:2660
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
+msgstr ""
- #: g10/import.c:2696
++#: g10/import.c:2789
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
+msgstr ""
- #: g10/import.c:2760
++#: g10/import.c:2853
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
-msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
+msgstr ""
- #: g10/import.c:2776
++#: g10/import.c:2869
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
-msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
+msgstr ""
- #: g10/import.c:2840
++#: g10/import.c:2933
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
-msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
+msgstr ""
- #: g10/import.c:2878
++#: g10/import.c:2971
#, c-format
msgid "key %s: direct key signature added\n"
-msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
+msgstr ""
+#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, c-format
msgid "error creating keybox '%s': %s\n"
-msgstr "建立金鑰鑰匙盒 '%s' 時出錯: %s\n"
+msgstr ""
+#: g10/keydb.c:405 g10/keydb.c:432
#, c-format
msgid "error creating keyring '%s': %s\n"
-msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
+msgstr ""
+#: g10/keydb.c:441 sm/keydb.c:229
#, c-format
msgid "keybox '%s' created\n"
-msgstr "鑰匙盒 '%s' 已建立\n"
+msgstr ""
+#: g10/keydb.c:443
#, c-format
msgid "keyring '%s' created\n"
-msgstr "鑰匙圈 '%s' 已建立\n"
+msgstr ""
+#: g10/keydb.c:822
#, c-format
msgid "keyblock resource '%s': %s\n"
-msgstr "金鑰區塊資源 '%s': %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "error opening '%s': %s\n"
+#: g10/keydb.c:907
+#, c-format
msgid "error opening key DB: %s\n"
-msgstr "開啟 '%s' 時出錯: %s\n"
+msgstr ""
+#: g10/keydb.c:1778
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
-msgstr "重新建立鑰匙圈快取失敗: %s\n"
+msgstr ""
+#: g10/keyedit.c:264
msgid "[revocation]"
-msgstr "[撤銷]"
+msgstr ""
+#: g10/keyedit.c:264
msgid "[self-signature]"
-msgstr "[自我簽章]"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "key %s: unsupported public key algorithm\n"
+#: g10/keyedit.c:618
+#, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-msgstr "金鑰 %s: 未支援的公鑰演算法\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "card does not support digest algorithm %s\n"
+#: g10/keyedit.c:627
+#, c-format
msgid ""
"can't check signature with unsupported message-digest algorithm %d: %s.\n"
-msgstr "卡片不支援 %s 摘要演算法\n"
+msgstr ""
-#, fuzzy
-#| msgid "Good signature from"
+#: g10/keyedit.c:789
msgid " (reordered signatures follow)"
-msgstr "完好的簽章來自於"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "key %s: %s\n"
+#: g10/keyedit.c:902
+#, c-format
msgid "key %s:\n"
-msgstr "金鑰 %s: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "User ID \"%s\": %d signature removed\n"
+#: g10/keyedit.c:905
+#, c-format
msgid "%d duplicate signature removed\n"
msgid_plural "%d duplicate signatures removed\n"
-msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
+msgstr[0] ""
+msgstr[1] ""
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
+#: g10/keyedit.c:908 g10/keylist.c:480
+#, c-format
msgid "%d signature not checked due to a missing key\n"
msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "有 1 份簽章因為遺失金鑰而未被檢查\n"
+msgstr[0] ""
+msgstr[1] ""
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
+#: g10/keyedit.c:912 g10/keylist.c:476
+#, c-format
msgid "%d bad signature\n"
msgid_plural "%d bad signatures\n"
-msgstr[0] "%d 份損壞的簽章\n"
+msgstr[0] ""
+msgstr[1] ""
-#, fuzzy, c-format
-#| msgid "Good signature from"
+#: g10/keyedit.c:916
+#, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
-msgstr[0] "完好的簽章來自於"
+msgstr[0] ""
+msgstr[1] ""
+#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
@@@ -3770,219 -3017,169 +3746,219 @@@ msgid "
"Are you sure that you want to sign this key with your\n"
"key \"%s\" (%s)\n"
msgstr ""
-"你真的確定要用你的金鑰 \"%s\" (%s)\n"
-"來簽署這把金鑰嗎\n"
+#: g10/keyedit.c:1518
msgid "This will be a self-signature.\n"
-msgstr "這將會是一份自我簽章.\n"
+msgstr ""
+#: g10/keyedit.c:1523
msgid "WARNING: the signature will not be marked as non-exportable.\n"
-msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
+msgstr ""
+#: g10/keyedit.c:1530
msgid "WARNING: the signature will not be marked as non-revocable.\n"
-msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
+msgstr ""
+#: g10/keyedit.c:1540
msgid "The signature will be marked as non-exportable.\n"
-msgstr "這份簽章會被標記成不可匯出.\n"
+msgstr ""
+#: g10/keyedit.c:1547
msgid "The signature will be marked as non-revocable.\n"
-msgstr "這份簽章會被標記成不可撤銷.\n"
+msgstr ""
+#: g10/keyedit.c:1554
msgid "I have not checked this key at all.\n"
-msgstr "我根本沒有檢查過這把金鑰.\n"
+msgstr ""
+#: g10/keyedit.c:1559
msgid "I have checked this key casually.\n"
-msgstr "我隨意檢查過這把金鑰了.\n"
+msgstr ""
+#: g10/keyedit.c:1564
msgid "I have checked this key very carefully.\n"
-msgstr "我非常小心地檢查過這把金鑰了.\n"
+msgstr ""
+#: g10/keyedit.c:1576
msgid "Really sign? (y/N) "
-msgstr "真的要簽署嗎? (y/N)"
+msgstr ""
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
-msgstr "簽署時失敗: %s\n"
+msgstr ""
+#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
-msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
+msgstr ""
+#: g10/keyedit.c:1744
#, c-format
msgid "key %s: error changing passphrase: %s\n"
-msgstr "金鑰 %s: 變更密語時出錯: %s\n"
+msgstr ""
+#: g10/keyedit.c:1858
msgid "save and quit"
-msgstr "儲存並離開"
+msgstr ""
+#: g10/keyedit.c:1861
msgid "show key fingerprint"
-msgstr "顯示金鑰指紋"
+msgstr ""
-#, fuzzy
-#| msgid "Enter the keygrip: "
+#: g10/keyedit.c:1862
msgid "show the keygrip"
-msgstr "請輸入金鑰鑰柄: "
+msgstr ""
+#: g10/keyedit.c:1863
msgid "list key and user IDs"
-msgstr "列出金鑰和使用者 ID"
+msgstr ""
+#: g10/keyedit.c:1865
msgid "select user ID N"
-msgstr "選擇使用者 ID N"
+msgstr ""
+#: g10/keyedit.c:1866
msgid "select subkey N"
-msgstr "選擇子鑰 N"
+msgstr ""
+#: g10/keyedit.c:1867
msgid "check signatures"
-msgstr "檢查簽章"
+msgstr ""
+#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
-msgstr "簽署所選的使用者 ID [* 請參見底下相關的註解]"
+msgstr ""
+#: g10/keyedit.c:1878
msgid "sign selected user IDs locally"
-msgstr "僅在本機簽署所選的使用者 ID"
+msgstr ""
+#: g10/keyedit.c:1879
msgid "sign selected user IDs with a trust signature"
-msgstr "用信任簽章來簽署所選的使用者 ID"
+msgstr ""
+#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
-msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
+msgstr ""
+#: g10/keyedit.c:1883
msgid "add a user ID"
-msgstr "增加使用者 ID"
+msgstr ""
+#: g10/keyedit.c:1885
msgid "add a photo ID"
-msgstr "增加照片 ID"
+msgstr ""
+#: g10/keyedit.c:1886
msgid "delete selected user IDs"
-msgstr "刪除所選的使用者 ID"
+msgstr ""
+#: g10/keyedit.c:1889
msgid "add a subkey"
-msgstr "增加子鑰"
+msgstr ""
+#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
-msgstr "將金鑰加到智慧卡"
+msgstr ""
+#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
-msgstr "將金鑰移動到智慧卡"
+msgstr ""
+#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
-msgstr "將備份金鑰移動到智慧卡"
+msgstr ""
+#: g10/keyedit.c:1898
msgid "delete selected subkeys"
-msgstr "刪除所選的子鑰"
+msgstr ""
+#: g10/keyedit.c:1900
msgid "add a revocation key"
-msgstr "增加撤銷金鑰"
+msgstr ""
+#: g10/keyedit.c:1902
msgid "delete signatures from the selected user IDs"
-msgstr "從所選的使用者 ID 中刪除簽章"
+msgstr ""
+#: g10/keyedit.c:1904
msgid "change the expiration date for the key or selected subkeys"
-msgstr "變更金鑰或所選子鑰的使用期限"
+msgstr ""
+#: g10/keyedit.c:1906
msgid "flag the selected user ID as primary"
-msgstr "把所選的使用者 ID 標為主要"
+msgstr ""
+#: g10/keyedit.c:1909
msgid "list preferences (expert)"
-msgstr "列出偏好 (專家模式)"
+msgstr ""
+#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
-msgstr "列出偏好 (囉唆模式)"
+msgstr ""
+#: g10/keyedit.c:1912
msgid "set preference list for the selected user IDs"
-msgstr "設定所選使用者 ID 的偏好清單"
+msgstr ""
+#: g10/keyedit.c:1915
msgid "set the preferred keyserver URL for the selected user IDs"
-msgstr "為所選的使用者 ID 設定偏好的金鑰伺服器 URL"
+msgstr ""
+#: g10/keyedit.c:1917
msgid "set a notation for the selected user IDs"
-msgstr "為所選的使用者 ID 設定註記"
+msgstr ""
+#: g10/keyedit.c:1919
msgid "change the passphrase"
-msgstr "更改密語"
+msgstr ""
+#: g10/keyedit.c:1922
msgid "change the ownertrust"
-msgstr "更改主觀信任"
+msgstr ""
+#: g10/keyedit.c:1925
msgid "revoke signatures on the selected user IDs"
-msgstr "撤銷所選使用者 ID 的簽章"
+msgstr ""
+#: g10/keyedit.c:1927
msgid "revoke selected user IDs"
-msgstr "撤銷所選的使用者 ID"
+msgstr ""
+#: g10/keyedit.c:1930
msgid "revoke key or selected subkeys"
-msgstr "撤銷金鑰或所選的子鑰"
+msgstr ""
+#: g10/keyedit.c:1932
msgid "enable key"
-msgstr "啟用金鑰"
+msgstr ""
+#: g10/keyedit.c:1933
msgid "disable key"
-msgstr "停用金鑰"
+msgstr ""
+#: g10/keyedit.c:1935
msgid "show selected photo IDs"
-msgstr "顯示所選的照片 ID"
+msgstr ""
+#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
-msgstr "從金鑰中精簡無法使用的使用者 ID 並移除無法使用的簽章"
+msgstr ""
+#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
-msgstr "從金鑰中精簡無法使用的使用者 ID 並移除所有的簽章"
+msgstr ""
+#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
-msgstr "私鑰可用.\n"
+msgstr ""
+#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
-msgstr "要有私鑰纔能這麼做.\n"
+msgstr ""
+#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4242,18 -3389,15 +4218,18 @@@ msgid "
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr ""
-"請注意顯示出來的金鑰有效性不需要更正,\n"
-"除非你重新執行程式.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
msgid "revoked"
-msgstr "已撤銷"
+msgstr ""
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
msgid "expired"
-msgstr "已過期"
+msgstr ""
+#: g10/keyedit.c:4175
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"
@@@ -5099,54 -4116,45 +5075,54 @@@ msgstr "
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
-msgstr " 主鑰指紋:"
+msgstr ""
+#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
-msgstr " 子鑰指紋:"
+msgstr ""
-# use tty
+#: g10/keylist.c:1727 g10/keylist.c:1743
msgid " Key fingerprint ="
-msgstr " 金鑰指紋 ="
+msgstr ""
+#: g10/keylist.c:1794
msgid " Card serial no. ="
-msgstr " 卡片序號 ="
+msgstr ""
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, c-format
msgid "caching keyring '%s'\n"
-msgstr "快取鑰匙圈 '%s' 中\n"
+msgstr ""
- #: g10/keyring.c:1566
-#, fuzzy, c-format
-#| msgid "%lu keys cached so far (%lu signatures)\n"
++#: g10/keyring.c:1572
+#, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
-msgstr[0] "目前已檢查 %lu 把金鑰 (共 %lu 份簽章)\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyring.c:1582
-#, fuzzy, c-format
-#| msgid "flush the cache"
++#: g10/keyring.c:1588
+#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
-msgstr[0] "清除快取"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyring.c:1584
-#, fuzzy, c-format
-#| msgid "1 bad signature\n"
++#: g10/keyring.c:1590
+#, c-format
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
-msgstr[0] "1 份損壞的簽章\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
-msgstr "%s: 鑰匙圈已建立\n"
+msgstr ""
+#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
@@@ -5162,356 -4167,289 +5138,361 @@@ msgstr "
msgid "override timeout options set for dirmngr"
msgstr ""
+#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
-msgstr "驗證簽章時自動取回金鑰"
+msgstr ""
+#: g10/keyserver.c:101
msgid "honor the preferred keyserver URL set on the key"
-msgstr "尊重金鑰上所設定的偏好金鑰伺服器 URL"
+msgstr ""
+#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
-msgstr "取回金鑰時尊重金鑰所設定的 PKA 記錄"
+msgstr ""
+#: g10/keyserver.c:548
msgid "disabled"
-msgstr "已停用"
+msgstr ""
+#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
-msgstr "請輸入數字, N)下一頁, 或 Q)離開 > "
+msgstr ""
+#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
-msgstr "無效的金鑰伺服器協定 (我們用 %d!=經手程式 %d)\n"
+msgstr ""
+#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
-msgstr "\"%s\" 並非金鑰 ID: 跳過中\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "refreshing %d keys from %s\n"
+#: g10/keyserver.c:1419 g10/keyserver.c:1452
+#, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
-msgstr[0] "更新 %d 份金鑰中 (從 %s )\n"
+msgstr[0] ""
+msgstr[1] ""
+#: g10/keyserver.c:1426
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
-msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
+msgstr ""
+#: g10/keyserver.c:1530
#, c-format
msgid "key \"%s\" not found on keyserver\n"
-msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
+msgstr ""
+#: g10/keyserver.c:1533
msgid "key not found on keyserver\n"
-msgstr "在金鑰伺服器上找不到金鑰\n"
+msgstr ""
+#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
-msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
+msgstr ""
+#: g10/keyserver.c:1701
#, c-format
msgid "requesting key %s from %s server %s\n"
-msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
+msgstr ""
+#: g10/keyserver.c:1705
#, c-format
msgid "requesting key %s from %s\n"
-msgstr "正在請求金鑰 %s 自 %s\n"
+msgstr ""
-#, fuzzy
-#| msgid "invalid keyserver options\n"
+#: g10/keyserver.c:1805 g10/keyserver.c:1960
msgid "no keyserver known\n"
-msgstr "無效的金鑰伺服器選項\n"
+msgstr ""
+#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
#, c-format
msgid "skipped \"%s\": %s\n"
-msgstr "已跳過 \"%s\": %s\n"
+msgstr ""
+#: g10/keyserver.c:1823
#, c-format
msgid "sending key %s to %s\n"
-msgstr "遞送金鑰 %s 至 %s\n"
+msgstr ""
+#: g10/keyserver.c:1864
#, c-format
msgid "requesting key from '%s'\n"
-msgstr "正在向 '%s' 請求金鑰\n"
+msgstr ""
+#: g10/keyserver.c:1880
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
-msgstr "警告: 無法抓取 URI %s: %s\n"
+msgstr ""
+#: g10/mainproc.c:254
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
-msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
+msgstr ""
+#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
-msgstr "%s 加密過的階段金鑰\n"
+msgstr ""
+#: g10/mainproc.c:312
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "密語係以未知的 %d 摘要演算法所產生\n"
+msgstr ""
+#: g10/mainproc.c:378
#, c-format
msgid "public key is %s\n"
-msgstr "公鑰為 %s\n"
+msgstr ""
+#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
-msgstr "公鑰加密過的資料: 完好的 DEK\n"
+msgstr ""
+#: g10/mainproc.c:489
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
-msgstr "已用 %u 位元長的 %s 金鑰, ID %s, 建立於 %s 所加密\n"
+msgstr ""
+#: g10/mainproc.c:493 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
-msgstr " \"%s\"\n"
+msgstr ""
+#: g10/mainproc.c:497
#, c-format
msgid "encrypted with %s key, ID %s\n"
-msgstr "已用 %s 金鑰, ID %s 所加密\n"
+msgstr ""
+#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
-msgstr "公鑰解密失敗: %s\n"
+msgstr ""
+#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
-msgstr "已用 %lu 個密語加密了\n"
+msgstr ""
+#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
-msgstr "已用 1 個密語加密了\n"
+msgstr ""
+#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
-msgstr "假定 %s 為加密過的資料\n"
+msgstr ""
+#: g10/mainproc.c:573
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
+msgstr ""
+#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
-msgstr "警告: 訊息未受到完整的保護\n"
+msgstr ""
+#: g10/mainproc.c:628
msgid "decryption okay\n"
-msgstr "解密成功\n"
+msgstr ""
+#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "警告: 加密過的訊息已經被變造了!\n"
+msgstr ""
+#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
-msgstr "解密失敗: %s\n"
+msgstr ""
+#: g10/mainproc.c:676
msgid "Note: sender requested \"for-your-eyes-only\"\n"
-msgstr "請注意: 寄件者要求了 \"只准你用眼睛看\"\n"
+msgstr ""
+#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
-msgstr "原始的檔名 ='%.*s'\n"
+msgstr ""
+#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
-msgstr "警告: 看到了多份明文\n"
+msgstr ""
+#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
-msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
+msgstr ""
+#: g10/mainproc.c:1214 g10/mainproc.c:1257
msgid "no signature found\n"
-msgstr "找不到簽章\n"
+msgstr ""
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, c-format
msgid "BAD signature from \"%s\""
-msgstr "*損壞* 的簽章來自於 \"%s\""
+msgstr ""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, c-format
msgid "Expired signature from \"%s\""
-msgstr "過期的簽章來自於 \"%s\""
+msgstr ""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, c-format
msgid "Good signature from \"%s\""
-msgstr "完好的簽章來自於 \"%s\""
+msgstr ""
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
-msgstr "簽章驗證已抑制\n"
+msgstr ""
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
msgid "can't handle this ambiguous signature data\n"
-msgstr "無法處理這個不明確的簽章資料\n"
+msgstr ""
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, c-format
msgid "Signature made %s\n"
-msgstr "由 %s 建立的簽章\n"
+msgstr ""
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, c-format
msgid " using %s key %s\n"
-msgstr " 使用 %s 金鑰 %s\n"
+msgstr ""
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, c-format
msgid "Signature made %s using %s key ID %s\n"
-msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
+msgstr ""
- #: g10/mainproc.c:1744
-#, fuzzy, c-format
-#| msgid " aka \"%s\""
++#: g10/mainproc.c:1755
++#, c-format
+ msgid " issuer \"%s\"\n"
-msgstr " 亦即 \"%s\""
++msgstr ""
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
-msgstr "可用的金鑰於: "
+msgstr ""
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
-msgstr "[ 不確定 ]"
+msgstr ""
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, c-format
msgid " aka \"%s\""
-msgstr " 亦即 \"%s\""
+msgstr ""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
-msgstr "這份簽署已經在 %s 過期了\n"
+msgstr ""
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
-msgstr "這份簽署將在 %s 到期\n"
+msgstr ""
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
-msgstr "%s 簽章, 摘要演算法 %s%s%s\n"
+msgstr ""
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
-msgstr "二進制"
+msgstr ""
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
-msgstr "文字模式"
+msgstr ""
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
-msgstr "未知"
+msgstr ""
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
msgid ", key algorithm "
-msgstr ", 金鑰演算法 "
+msgstr ""
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
-msgstr "無法檢查簽章: %s\n"
+msgstr ""
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
-msgstr "不是一份分離的簽章\n"
+msgstr ""
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
-msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
+msgstr ""
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
-msgstr "等級 0x%02x 的獨立簽章\n"
+msgstr ""
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
-msgstr "舊型 (PGP 2.x) 簽章\n"
+msgstr ""
+#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, c-format
msgid "fstat of '%s' failed in %s: %s\n"
-msgstr "'%s' 的 fstat 失敗於 %s: %s\n"
+msgstr ""
+#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
-msgstr "fstat(%d) 失敗於 %s: %s\n"
+msgstr ""
+#: g10/misc.c:279
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
-msgstr "警告: 正在使用實驗性的 %s 公鑰演算法\n"
+msgstr ""
+#: g10/misc.c:286
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
-msgstr "警告: 已不建議使用 Elgamal 簽署暨加密金鑰\n"
+msgstr ""
+#: g10/misc.c:300
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
-msgstr "警告: 正在使用實驗性的 %s 編密演算法\n"
+msgstr ""
+#: g10/misc.c:319
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
-msgstr "警告: 正在使用實驗性的 %s 摘要演算法\n"
+msgstr ""
+#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "警告: 已不建議使用 %s 摘要演算法\n"
+msgstr ""
+#: g10/misc.c:353
#, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "請注意: 採用 %s 演算法的簽章已遭駁回\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "%s:%u: read error: %s\n"
+#: g10/misc.c:375
+#, c-format
msgid "(reported error: %s)\n"
-msgstr "%s:%u: 讀取錯誤: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "read error in '%s': %s\n"
+#: g10/misc.c:378
+#, c-format
msgid "(reported error: %s <%s>)\n"
-msgstr "'%s' 讀取錯誤: %s\n"
+msgstr ""
+#: g10/misc.c:397
msgid "(further info: "
msgstr ""
@@@ -5544,162 -4476,107 +5525,135 @@@ msgstr "
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
-msgstr "警告: \"%s%s\" 是已廢棄的選項 - 除了對 %s 之外沒有效果\n"
+msgstr ""
+#: g10/misc.c:1147
msgid "Uncompressed"
-msgstr "未壓縮"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:1172
msgid "uncompressed|none"
-msgstr "uncompressed|none|未壓縮|無"
+msgstr ""
+#: g10/misc.c:1292
#, c-format
msgid "this message may not be usable by %s\n"
-msgstr "這個訊息對 %s 來說無法使用\n"
+msgstr ""
+#: g10/misc.c:1467
#, c-format
msgid "ambiguous option '%s'\n"
-msgstr "不明確的選項 '%s'\n"
+msgstr ""
+#: g10/misc.c:1492
#, c-format
msgid "unknown option '%s'\n"
-msgstr "未知的選項 '%s'\n"
+msgstr ""
+#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
-msgstr "ECDSA 公鑰應該要是 8 位元倍數的 SEC 編碼\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "Unknown signature type '%s'\n"
+#: g10/misc.c:1752
+#, c-format
msgid "unknown weak digest '%s'\n"
-msgstr "未知的簽章種類 '%s'\n"
+msgstr ""
+#: g10/openfile.c:84
#, c-format
msgid "File '%s' exists. "
-msgstr "檔案 '%s' 已存在. "
+msgstr ""
+#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
-msgstr "是否覆寫? (y/N) "
+msgstr ""
+#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
-msgstr "%s: 未知的副檔名\n"
+msgstr ""
+#: g10/openfile.c:147
msgid "Enter new filename"
-msgstr "請輸入新的檔名"
+msgstr ""
+#: g10/openfile.c:218
msgid "writing to stdout\n"
-msgstr "寫到標準輸出中\n"
+msgstr ""
+#: g10/openfile.c:366
#, c-format
msgid "assuming signed data in '%s'\n"
-msgstr "假設被簽署的資料在 '%s'\n"
+msgstr ""
+#: g10/openfile.c:457
#, c-format
msgid "new configuration file '%s' created\n"
-msgstr "新的組態檔案 '%s' 已建立\n"
+msgstr ""
+#: g10/openfile.c:498
#, c-format
msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr "警告: 在 '%s' 裡的選項於這次執行期間並沒有被啟用\n"
+msgstr ""
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
-msgstr "無法操作 %d 公開金鑰演算法\n"
+msgstr ""
+#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
-msgstr "警告: 可能並不安全的對稱式加密階段金鑰\n"
+msgstr ""
+#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
-msgstr "%d 類別的子封包設定了關鍵位元\n"
+msgstr ""
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, c-format
msgid "problem with the agent: %s\n"
-msgstr "代理程式的問題: %s\n"
+msgstr ""
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, c-format
- msgid " (main key ID %s)"
- msgstr ""
-
- #: g10/passphrase.c:277
- #, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
-msgstr "請輸入密語\n"
+msgstr ""
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
-msgstr "由使用者所取消\n"
+msgstr ""
- #: g10/passphrase.c:483
++#: g10/passphrase.c:489
#, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
-
- #: g10/passphrase.c:491
- #, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr ""
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
+ msgid " (main key ID %s)"
-msgstr " (主要金鑰 ID %s)"
+msgstr ""
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
-msgstr "請輸入密語來解鎖 OpenPGP 私鑰:"
+msgstr ""
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
msgid "Please enter the passphrase to import the OpenPGP secret key:"
-msgstr "請輸入密語來匯入 OpenPGP 私鑰:"
+msgstr ""
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
-msgstr "請輸入密語來匯出 OpenPGP 私子鑰:"
+msgstr ""
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
msgid "Please enter the passphrase to export the OpenPGP secret key:"
-msgstr "請輸入密語來匯出 OpenPGP 私鑰:"
+msgstr ""
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
-msgstr "你是否真的想要永久刪除 OpenPGP 私鑰子鑰:"
+msgstr ""
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
msgid "Do you really want to permanently delete the OpenPGP secret key:"
-msgstr "你是否真的想要永久刪除 OpenPGP 私鑰:"
+msgstr ""
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, c-format
msgid ""
"%s\n"
@@@ -5875,278 -4731,225 +5829,278 @@@ msgid "
"in the user ID. If you *really* know what you are doing,\n"
"you may answer the next question with yes.\n"
msgstr ""
-"這把金鑰並 *不* 確定屬於使用者 ID 裡的那個人.\n"
-"除非你 **真的** 知道自己在做甚麼,\n"
-"否則你最好在下一個問題回答 no\n"
+#: g10/pkclist.c:495
msgid "Use this key anyway? (y/N) "
-msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
+msgstr ""
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
-msgstr "警告: 正在使用不被信任的金鑰!\n"
+msgstr ""
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
-msgstr "警告: 這把金鑰可能已撤銷 (撤銷金鑰未出現)\n"
+msgstr ""
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
-msgstr "警告: 這把金鑰已被指定撤銷者所撤銷!\n"
+msgstr ""
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "警告: 這把金鑰已被其持有人所撤銷!\n"
+msgstr ""
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
msgid " This could mean that the signature is forged.\n"
-msgstr " 這很有可能表示此簽章是偽造的.\n"
+msgstr ""
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "警告: 這把子鑰已被其持有人所撤銷!\n"
+msgstr ""
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
-msgstr "請注意: 這把金鑰已停用.\n"
+msgstr ""
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
-msgstr "請注意: 已驗證的簽署者地址為 '%s'\n"
+msgstr ""
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
-msgstr "請注意: 簽署者地址 '%s' 與 DNS 項目並不吻合\n"
+msgstr ""
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
-msgstr "信任等級因有效的 PKA 資訊而調整為 *完全*\n"
+msgstr ""
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
-msgstr "信任等級因不良的 PKA 資訊而調整為 *永遠不會*\n"
+msgstr ""
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
-msgstr "請注意: 這把金鑰已經過期了!\n"
+msgstr ""
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
+msgstr ""
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
-msgstr " 沒有證據指出這個簽章屬於這個持有者.\n"
+msgstr ""
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
-msgstr "警告: 我們 *不* 信任這把金鑰!\n"
+msgstr ""
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
-msgstr " 這個簽章很有可能是 *偽造的*.\n"
+msgstr ""
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
+msgstr ""
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
msgid " It is not certain that the signature belongs to the owner.\n"
-msgstr " 這份簽章並不屬於這個持有者\n"
+msgstr ""
- #: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
-msgstr "%s: 已跳過: %s\n"
+msgstr ""
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: 已跳過: 公鑰已停用\n"
+msgstr ""
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
-msgstr "%s: 已跳過: 公鑰已存在\n"
+msgstr ""
- #: g10/pkclist.c:969
-#, fuzzy, c-format
-#| msgid "can't connect to '%s': %s\n"
++#: g10/pkclist.c:973
+#, c-format
msgid "can't encrypt to '%s'\n"
-msgstr "無法連接至 '%s': %s\n"
+msgstr ""
- #: g10/pkclist.c:984
-#, fuzzy, c-format
-#| msgid "line %d: invalid date given\n"
++#: g10/pkclist.c:988
+#, c-format
msgid "option '%s' given, but no valid default keys given\n"
-msgstr "第 %d 列: 無效的給定日期\n"
+msgstr ""
- #: g10/pkclist.c:991
-#, fuzzy, c-format
-#| msgid "line %d: invalid date given\n"
++#: g10/pkclist.c:995
+#, c-format
msgid "option '%s' given, but option '%s' not given\n"
-msgstr "第 %d 列: 無效的給定日期\n"
+msgstr ""
- #: g10/pkclist.c:1094
++#: g10/pkclist.c:1098
msgid "You did not specify a user ID. (you may use \"-r\")\n"
-msgstr "你沒有指定使用者 ID. (你可能得用 \"-r\")\n"
+msgstr ""
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
-msgstr "目前的收件者:\n"
+msgstr ""
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
msgstr ""
-"\n"
-"請輸入使用者 ID. 以空白列結束: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
-msgstr "沒有這個使用者 ID.\n"
+msgstr ""
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
msgid "skipped: public key already set as default recipient\n"
-msgstr "已跳過: 公鑰已經被設成預設收件者\n"
+msgstr ""
- #: g10/pkclist.c:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
-msgstr "公鑰已停用.\n"
+msgstr ""
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
-msgstr "已跳過: 公鑰已設過\n"
+msgstr ""
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, c-format
msgid "unknown default recipient \"%s\"\n"
-msgstr "未知的預設收件者 \"%s\"\n"
+msgstr ""
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
-msgstr "沒有有效的地址\n"
+msgstr ""
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, c-format
msgid "Note: key %s has no %s feature\n"
-msgstr "請注意: 金鑰 %s 沒有 %s 功能\n"
+msgstr ""
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, c-format
msgid "Note: key %s has no preference for %s\n"
-msgstr "警告: 金鑰 %s 沒有 %s 的偏好設定\n"
+msgstr ""
+#: g10/plaintext.c:84
msgid "data not saved; use option \"--output\" to save it\n"
-msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存\n"
+msgstr ""
+#: g10/plaintext.c:598
msgid "Detached signature.\n"
-msgstr "分離的簽章.\n"
+msgstr ""
+#: g10/plaintext.c:606
msgid "Please enter name of data file: "
-msgstr "請輸入資料檔的名稱: "
+msgstr ""
+#: g10/plaintext.c:643
msgid "reading stdin ...\n"
-msgstr "正在讀取標準輸入中 ...\n"
+msgstr ""
+#: g10/plaintext.c:688
msgid "no signed data\n"
-msgstr "沒有被簽署過的資料\n"
+msgstr ""
+#: g10/plaintext.c:706
#, c-format
msgid "can't open signed data '%s'\n"
-msgstr "無法開啟被簽署過的資料 '%s'\n"
+msgstr ""
+#: g10/plaintext.c:741
#, c-format
msgid "can't open signed data fd=%d: %s\n"
-msgstr "無法開啟被簽署過的資料 fd=%d: %s\n"
+msgstr ""
+#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
-msgstr "匿名收件者; 正在嘗試使用私鑰 %s ...\n"
+msgstr ""
+#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
-msgstr "很好, 我們就是匿名收件者.\n"
+msgstr ""
+#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
-msgstr "不支援舊式的 DEK 編碼\n"
+msgstr ""
+#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "%d%s 編密演算法未知或已停用\n"
+msgstr ""
+#: g10/pubkey-enc.c:352
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
-msgstr "警告: 收件者偏好設定中找不到 %s 編密演算法\n"
+msgstr ""
+#: g10/pubkey-enc.c:377
#, c-format
msgid "Note: secret key %s expired at %s\n"
-msgstr "請注意: 私鑰 %s 已於 %s 過期\n"
+msgstr ""
+#: g10/pubkey-enc.c:384
msgid "Note: key has been revoked"
-msgstr "請注意: 金鑰已撤銷"
+msgstr ""
+#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
+#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
-msgstr "build_packet 失敗: %s\n"
+msgstr ""
+#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
-msgstr "金鑰 %s 沒有使用者 ID\n"
+msgstr ""
+#: g10/revoke.c:312
msgid "To be revoked by:\n"
-msgstr "將被撤銷:\n"
+msgstr ""
+#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
-msgstr "(這是把機密的撤銷金鑰)\n"
+msgstr ""
-#, fuzzy
-#| msgid "Secret key is available.\n"
+#: g10/revoke.c:322
msgid "Secret key is not available.\n"
-msgstr "私鑰可用.\n"
+msgstr ""
+#: g10/revoke.c:327
msgid "Create a designated revocation certificate for this key? (y/N) "
-msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
+msgstr ""
+#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
-msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
+msgstr ""
+#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
-msgstr "make_keysig_packet 失敗: %s\n"
+msgstr ""
+#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
-msgstr "已建立撤銷憑證.\n"
+msgstr ""
+#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
-msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
+msgstr ""
+#: g10/revoke.c:551
msgid "This is a revocation certificate for the OpenPGP key:"
-msgstr "這把 OpenPGP 金鑰有一份撤銷憑證."
+msgstr ""
+#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
@@@ -6206,91 -5022,83 +6160,91 @@@ msgid "
"your media become unreadable. But have some caution: The print system of\n"
"your machine might store the data and make it available to others!\n"
msgstr ""
-"已建立撤銷憑證.\n"
-"\n"
-"請把這個檔案搬移到另一個你能夠將之藏起來的媒介上;\n"
-"如果有人能夠取得這份憑證的話, 那麼他也能夠讓你的\n"
-"金鑰無法繼續使用. 把這份憑證列印出來再藏到別的地\n"
-"方也是很好的方法, 以免你的儲存媒介損毀而無法讀取.\n"
-"但是千萬小心: 你的機器上的列印系統可能會在列印過\n"
-"程中把這些資料暫存在某個其他人也能夠看得到的地方!\n"
+#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
-msgstr "請選擇撤銷的原因:\n"
+msgstr ""
+#: g10/revoke.c:779
msgid "Cancel"
-msgstr "取消"
+msgstr ""
+#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
-msgstr "(也許你會想要在這裡選擇 %d)\n"
+msgstr ""
+#: g10/revoke.c:822
msgid "Enter an optional description; end it with an empty line:\n"
-msgstr "請輸入選用的描述; 以空白列結束:\n"
+msgstr ""
+#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
-msgstr "撤銷原因: %s\n"
+msgstr ""
+#: g10/revoke.c:852
msgid "(No description given)\n"
-msgstr "(沒有給定描述)\n"
+msgstr ""
+#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
-msgstr "這樣可以嗎? (y/N) "
+msgstr ""
+#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
-msgstr "建立了弱金鑰 - 重試中\n"
+msgstr ""
+#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
-msgstr "無法避免對稱式編密法的弱金鑰; 已經試了 %d 次了!\n"
+msgstr ""
+#: g10/seskey.c:306
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
-msgstr "%s 金鑰 %s 使用不安全 (%zu 位元) 的雜湊\n"
+msgstr ""
+#: g10/seskey.c:324
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
-msgstr "%s 金鑰 %s 需要 %zu 位元以上的雜湊 (雜湊為 %s)\n"
+msgstr ""
+#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
-msgstr "警告: 簽章摘要與訊息不一致\n"
+msgstr ""
+#: g10/sig-check.c:143
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
-msgstr "警告: 簽署子鑰 %s 未經交叉認證\n"
+msgstr ""
+#: g10/sig-check.c:145
#, c-format
msgid "please see %s for more information\n"
-msgstr "請參考 %s 上進一步的資訊\n"
+msgstr ""
+#: g10/sig-check.c:155
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
-msgstr "警告: 簽署子鑰 %s 有無效的交叉憑證\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "public key %s is %lu second newer than the signature\n"
+#: g10/sig-check.c:277
+#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
-msgstr[0] "公鑰 %s 比簽章還要新了 %lu 秒\n"
+msgstr[0] ""
+msgstr[1] ""
-#, fuzzy, c-format
-#| msgid "public key %s is %lu second newer than the signature\n"
+#: g10/sig-check.c:286
+#, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
-msgstr[0] "公鑰 %s 比簽章還要新了 %lu 秒\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/sig-check.c:300 g10/sign.c:251
-#, fuzzy, c-format
-#| msgid ""
-#| "key %s was created %lu second in the future (time warp or clock problem)\n"
++#: g10/sig-check.c:300 g10/sign.c:266
+#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6347,368 -5148,298 +6301,360 @@@ msgstr "
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
"unexpanded.\n"
-msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
+msgstr ""
- #: g10/sign.c:314
++#: g10/sign.c:329
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
-msgstr "%s/%s 簽章來自: \"%s\"\n"
+msgstr ""
- #: g10/sign.c:863
++#: g10/sign.c:878
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
+msgstr ""
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
-msgstr "簽署:"
+msgstr ""
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
-msgstr "%s 加密將被採用\n"
+msgstr ""
+#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
+msgstr ""
+#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
-msgstr "已跳過 \"%s\": 重複了\n"
+msgstr ""
+#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
-msgstr "已跳過: 私鑰已經存在\n"
+msgstr ""
+#: g10/skclist.c:225
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
-msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
+msgstr ""
+#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
-msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
+msgstr ""
+#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
"# (Use \"gpg --import-ownertrust\" to restore them)\n"
msgstr ""
-"# 相對應的信任值清單被建立於 %s\n"
-"# (請用 \"gpg --import-ownertrust\" 來取回它們)\n"
+#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, c-format
msgid "error in '%s': %s\n"
-msgstr "在 '%s' 中出錯: %s\n"
+msgstr ""
+#: g10/tdbdump.c:162
msgid "line too long"
-msgstr "列太長"
+msgstr ""
+#: g10/tdbdump.c:170
msgid "colon missing"
-msgstr "冒號缺漏"
+msgstr ""
+#: g10/tdbdump.c:176
msgid "invalid fingerprint"
-msgstr "無效的指紋"
+msgstr ""
+#: g10/tdbdump.c:181
msgid "ownertrust value missing"
-msgstr "主觀信任值缺漏"
+msgstr ""
+#: g10/tdbdump.c:217
#, c-format
msgid "error finding trust record in '%s': %s\n"
-msgstr "在 '%s' 中尋找信任記錄時出錯: %s\n"
+msgstr ""
+#: g10/tdbdump.c:221
#, c-format
msgid "read error in '%s': %s\n"
-msgstr "'%s' 讀取錯誤: %s\n"
+msgstr ""
+#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
-msgstr "信任資料庫: 同步化失敗: %s\n"
+msgstr ""
+#: g10/tdbio.c:141 sm/keydb.c:355
#, c-format
msgid "can't create lock for '%s'\n"
-msgstr "無法為 '%s' 建立鎖定\n"
+msgstr ""
+#: g10/tdbio.c:146
#, c-format
msgid "can't lock '%s'\n"
-msgstr "無法鎖定 '%s'\n"
+msgstr ""
+#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
-msgstr "信任資料庫記錄 %lu: 本機搜尋失敗: %s\n"
+msgstr ""
+#: g10/tdbio.c:213 g10/tdbio.c:1798
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
-msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
+msgstr ""
+#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
-msgstr "信任資料庫更動量過大\n"
+msgstr ""
+#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
-msgstr "%s: 目錄不存在!\n"
+msgstr ""
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, c-format
msgid "can't access '%s': %s\n"
-msgstr "無法存取 '%s': %s\n"
+msgstr ""
+#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
-msgstr "%s: 建立版本記錄失敗: %s"
+msgstr ""
+#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
-msgstr "%s: 建立了無效的信任資料庫\n"
+msgstr ""
+#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
-msgstr "%s: 建立了信任資料庫\n"
+msgstr ""
+#: g10/tdbio.c:788
msgid "Note: trustdb not writable\n"
-msgstr "請注意: 信任資料庫不可寫入\n"
+msgstr ""
+#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
-msgstr "%s: 無效的信任資料庫\n"
+msgstr ""
+#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s: 建立雜湊表失敗: %s\n"
+msgstr ""
+#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
-msgstr "%s: 更新版本記錄時錯誤: %s\n"
+msgstr ""
+#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
+#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
-msgstr "%s: 讀取版本記錄時錯誤: %s\n"
+msgstr ""
+#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
-msgstr "%s: 寫入版本記錄時錯誤: %s\n"
+msgstr ""
+#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
-msgstr "信任資料庫: 本機搜尋失敗: %s\n"
+msgstr ""
+#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "信任資料庫: 讀取失敗 (n=%d): %s\n"
+msgstr ""
+#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
-msgstr "%s: 不是一個信任資料庫檔案\n"
+msgstr ""
+#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
-msgstr "%s: 記錄編號為 %lu 的版本記錄\n"
+msgstr ""
+#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
-msgstr "%s: 無效的檔案版本 %d\n"
+msgstr ""
+#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
-msgstr "%s: 讀取可用空間記錄時出錯: %s\n"
+msgstr ""
+#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
-msgstr "%s: 寫入目錄記錄時出錯: %s\n"
+msgstr ""
+#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
-msgstr "%s: 記錄歸零失敗: %s\n"
+msgstr ""
+#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
-msgstr "%s: 附加記錄失敗: %s\n"
+msgstr ""
+#: g10/tdbio.c:1865
msgid "Error: The trustdb is corrupted.\n"
-msgstr "錯誤: 信任資料庫已毀損.\n"
+msgstr ""
+#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
-msgstr "無法處理長於 %d 字符的文字列\n"
+msgstr ""
+#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
-msgstr "輸入列比 %d 字符還長\n"
+msgstr ""
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
-#, fuzzy, c-format
-#| msgid "error sending standard options: %s\n"
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
+#, c-format
msgid "error beginning transaction on TOFU database: %s\n"
-msgstr "送出標準選項時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
-#, fuzzy, c-format
-#| msgid "unsupported algorithm: %s"
++#: g10/tofu.c:435
+#, c-format
msgid "unsupported TOFU database version: %s\n"
-msgstr "未支援的演算法: %s"
+msgstr ""
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
-#, fuzzy, c-format
-#| msgid "error sending data: %s\n"
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
+#, c-format
msgid "error reading TOFU database: %s\n"
-msgstr "送出資料時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:577 g10/tofu.c:585
-#, fuzzy, c-format
-#| msgid "error writing base64 encoding: %s\n"
++#: g10/tofu.c:500 g10/tofu.c:508
+#, c-format
msgid "error determining TOFU database's version: %s\n"
-msgstr "寫入 base64 編碼時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
-#, fuzzy, c-format
-#| msgid "error initializing reader object: %s\n"
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
+#, c-format
msgid "error initializing TOFU database: %s\n"
-msgstr "啟始讀取程式物件時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:761
-#, fuzzy, c-format
-#| msgid "error opening '%s': %s\n"
++#: g10/tofu.c:658
+#, c-format
msgid "error opening TOFU database '%s': %s\n"
-msgstr "開啟 '%s' 時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
-#, fuzzy, c-format
-#| msgid "error sending data: %s\n"
++#: g10/tofu.c:828 g10/tofu.c:2266
+#, c-format
msgid "error updating TOFU database: %s\n"
-msgstr "送出資料時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
-#, fuzzy, c-format
-#| msgid "error getting responder ID: %s\n"
++#: g10/tofu.c:1214
+#, c-format
msgid "error gathering other user IDs: %s\n"
-msgstr "取得回應程式 ID 時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
-#, fuzzy, c-format
-#| msgid "validity: %s"
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
+#, c-format
msgid "policy: %s"
-msgstr "有效性: %s"
+msgstr ""
- #: g10/tofu.c:1817
-#, fuzzy, c-format
-#| msgid "error getting stored flags: %s\n"
++#: g10/tofu.c:1290
+#, c-format
msgid "error gathering signature stats: %s\n"
-msgstr "取得已存放的旗標時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
-#, fuzzy
-#| msgid "list keys"
++#: g10/tofu.c:1332
msgid "this key"
-msgstr "列出金鑰"
+msgstr ""
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:1878
-#, fuzzy, c-format
-#| msgid "print message digests"
++#: g10/tofu.c:1351
+#, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
-msgstr[0] "印出訊息摘要"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -6718,93 -5448,75 +6664,93 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
-#, fuzzy, c-format
-#| msgid "error setting OCSP target: %s\n"
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
+#, c-format
msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "設定 OCSP 目標時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:2259
-#, fuzzy, c-format
-#| msgid "error creating a pipe: %s\n"
++#: g10/tofu.c:1727
+#, c-format
msgid "error changing TOFU policy: %s\n"
-msgstr "建立管道時出錯: %s\n"
+msgstr ""
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
-#, fuzzy, c-format
-#| msgid "print message digests"
++#: g10/tofu.c:1996
+#, c-format
msgid "Verified %ld messages signed by \"%s\"."
-msgstr "印出訊息摘要"
+msgstr ""
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -6813,22 -5525,17 +6759,22 @@@ msgid_plural "
"Verified %ld messages signed by \"%s\"\n"
"in the past %s."
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -6843,123 -5550,98 +6789,122 @@@ msgid_plural "
" %s\n"
"to mark it as being bad.\n"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
-#, fuzzy, c-format
-#| msgid "error sending data: %s\n"
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
+#, c-format
msgid "error opening TOFU database: %s\n"
-msgstr "送出資料時出錯: %s\n"
+msgstr ""
+#: g10/trustdb.c:215
#, c-format
msgid "'%s' is not a valid long keyID\n"
-msgstr "'%s' 不是有效的長式金鑰 ID\n"
+msgstr ""
+#: g10/trustdb.c:241
#, c-format
msgid "key %s: accepted as trusted key\n"
-msgstr "金鑰 %s: 如受信任的金鑰般被接受了\n"
+msgstr ""
+#: g10/trustdb.c:279
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
-msgstr "金鑰 %s 在信任資料庫中出現了不止一次\n"
+msgstr ""
+#: g10/trustdb.c:294
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
-msgstr "金鑰 %s: 受信任的金鑰沒有公鑰 - 已跳過\n"
+msgstr ""
+#: g10/trustdb.c:304
#, c-format
msgid "key %s marked as ultimately trusted\n"
-msgstr "金鑰 %s 已標記成徹底信任了\n"
+msgstr ""
+#: g10/trustdb.c:340
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "信任記錄 %lu, 請求類別 %d: 讀取失敗: %s\n"
+msgstr ""
+#: g10/trustdb.c:346
#, c-format
msgid "trust record %lu is not of requested type %d\n"
-msgstr "信任記錄 %lu 不是所請求的類別 %d\n"
+msgstr ""
+#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
-msgstr "你可以試著用下列指令來重建信任資料庫:\n"
+msgstr ""
+#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
-msgstr "如果行不通的話, 請查閱手冊\n"
+msgstr ""
+#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
-msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
+msgstr ""
+#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
-msgstr "正在使用 %s 信任模型\n"
+msgstr ""
+#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
-msgstr "不需要檢查信任資料庫\n"
+msgstr ""
+#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
-msgstr "下次信任資料庫檢查將於 %s 進行\n"
+msgstr ""
+#: g10/trustdb.c:525
#, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
-msgstr "在 '%s' 信任模型中並不需要檢查信任資料庫\n"
+msgstr ""
+#: g10/trustdb.c:541
#, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
-msgstr "在 '%s' 信任模型中並不需要更新信任資料庫\n"
+msgstr ""
+#: g10/trustdb.c:748 g10/trustdb.c:1283
#, c-format
msgid "public key %s not found: %s\n"
-msgstr "找不到公鑰 %s: %s\n"
+msgstr ""
+#: g10/trustdb.c:965
msgid "please do a --check-trustdb\n"
-msgstr "請做一次 --check-trustdb\n"
+msgstr ""
+#: g10/trustdb.c:970
msgid "checking the trustdb\n"
-msgstr "正在檢查信任資料庫\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "%lu keys processed so far\n"
+#: g10/trustdb.c:1853
+#, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
-msgstr[0] "目前已處理 %lu 把金鑰\n"
+msgstr[0] ""
+msgstr[1] ""
-#, fuzzy, c-format
-#| msgid "%d keys processed (%d validity counts cleared)\n"
+#: g10/trustdb.c:1856
+#, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
-msgstr[0] "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
+msgstr[0] ""
+msgstr[1] ""
+#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
-msgstr "沒有找到任何徹底信任的金鑰\n"
+msgstr ""
+#: g10/trustdb.c:1940
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
-msgstr "找不到徹底信任金鑰 %s 的公鑰\n"
+msgstr ""
+#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7347,348 -5962,269 +7292,348 @@@ msgstr "
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
+#: scd/app-dinsig.c:529
msgid "|N|Initial New PIN"
-msgstr "|N|開始新增個人識別碼 (PIN)"
+msgstr ""
+#: scd/scdaemon.c:114
msgid "run in multi server mode (foreground)"
-msgstr "以多重伺服器模式執行 (前景)"
+msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr "|等級|設定除錯等級為指定等級"
+msgstr ""
+#: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
msgid "|FILE|write a log to FILE"
-msgstr "|檔案|將日誌寫入至指定檔案"
+msgstr ""
+#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
-msgstr "|N|從 N 埠連線至讀卡機"
+msgstr ""
+#: scd/scdaemon.c:136
msgid "|NAME|use NAME as ct-API driver"
-msgstr "|名稱|使用指定名稱做為 ct-API 驅動程式"
+msgstr ""
+#: scd/scdaemon.c:138
msgid "|NAME|use NAME as PC/SC driver"
-msgstr "|名稱|使用指定名稱做為 PC/SC 驅動程式"
+msgstr ""
+#: scd/scdaemon.c:141
msgid "do not use the internal CCID driver"
-msgstr "不要使用內部的 CCID 驅動程式"
+msgstr ""
+#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
-msgstr "|N|沒有活動達 N 秒後就與卡片斷線"
+msgstr ""
+#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
-msgstr "不要使用讀卡機鍵盤"
+msgstr ""
+#: scd/scdaemon.c:155
msgid "deny the use of admin card commands"
-msgstr "禁用管理者卡片指令"
+msgstr ""
+#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
-msgstr "輸入 PIN 時在輸入區顯示成變動長度"
+msgstr ""
+#: scd/scdaemon.c:287
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
-msgstr "用法: @SCDAEMON@ [選項] (或用 -h 求助)"
+msgstr ""
+#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
-"語法: scdaemon [選項] [指令 [引數]]\n"
-"@GNUPG@ 智慧卡服務\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
msgid "please use the option '--daemon' to run the program in the background\n"
-msgstr "請使用 '--daemon' 選項來將此程式執行於背景\n"
+msgstr ""
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
-msgstr "用於 fd %d 的經手程式已啟動\n"
+msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
-msgstr "用於 fd %d 的經手程式已終止\n"
+msgstr ""
+#: sm/base64.c:327
#, c-format
msgid "invalid radix64 character %02x skipped\n"
-msgstr "已跳過無效的 radix64 字符 %02x\n"
+msgstr ""
-#, fuzzy
-#| msgid "no gpg-agent running in this session\n"
+#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
msgid "no dirmngr running in this session\n"
-msgstr "在此階段中沒有執行中的 gpg-agent\n"
+msgstr ""
+#: sm/certchain.c:194
#, c-format
msgid "validation model requested by certificate: %s"
-msgstr "憑證所要求的驗證模型: %s"
+msgstr ""
+#: sm/certchain.c:195 sm/certchain.c:1919
msgid "chain"
-msgstr "chain"
+msgstr ""
+#: sm/certchain.c:196 sm/certchain.c:1919
msgid "shell"
-msgstr "shell"
+msgstr ""
+#: sm/certchain.c:256 dirmngr/validate.c:107
#, c-format
msgid "critical certificate extension %s is not supported"
-msgstr "未支援關鍵憑證擴充欄位 %s"
+msgstr ""
+#: sm/certchain.c:295 dirmngr/validate.c:205
msgid "issuer certificate is not marked as a CA"
-msgstr "發行者憑證並未標記為 CA"
+msgstr ""
+#: sm/certchain.c:333
msgid "critical marked policy without configured policies"
-msgstr "關鍵已標記原則沒有已組態的原則"
+msgstr ""
+#: sm/certchain.c:343
#, c-format
msgid "failed to open '%s': %s\n"
-msgstr "開啟 '%s' 失敗: %s\n"
+msgstr ""
+#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
msgid "Note: non-critical certificate policy not allowed"
-msgstr "請注意: 不允許非關鍵的憑證原則"
+msgstr ""
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
msgid "certificate policy not allowed"
-msgstr "未允許憑證原則"
+msgstr ""
+#: sm/certchain.c:527
msgid "looking up issuer at external location\n"
-msgstr "從外部位置尋找發行者\n"
+msgstr ""
+#: sm/certchain.c:546
#, c-format
msgid "number of issuers matching: %d\n"
-msgstr "吻合的發行者數量: %d\n"
+msgstr ""
+#: sm/certchain.c:590
msgid "looking up issuer from the Dirmngr cache\n"
-msgstr "從 Dirmngr 快取尋找發行者\n"
+msgstr ""
+#: sm/certchain.c:614
#, c-format
msgid "number of matching certificates: %d\n"
-msgstr "吻合的憑證數量: %d\n"
+msgstr ""
+#: sm/certchain.c:616
#, c-format
msgid "dirmngr cache-only key lookup failed: %s\n"
-msgstr "尋找限於 dirmngr 快取的金鑰時失敗: %s\n"
+msgstr ""
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
+#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
msgid "failed to allocate keyDB handle\n"
-msgstr "配置 keyDB 代號失敗\n"
+msgstr ""
+#: sm/certchain.c:981
msgid "certificate has been revoked"
-msgstr "憑證已撤銷"
+msgstr ""
+#: sm/certchain.c:996
msgid "the status of the certificate is unknown"
-msgstr "憑證的狀態未知"
+msgstr ""
+#: sm/certchain.c:1003
msgid "please make sure that the \"dirmngr\" is properly installed\n"
-msgstr "請確認 \"dirmngr\" 已安裝妥善\n"
+msgstr ""
+#: sm/certchain.c:1009
#, c-format
msgid "checking the CRL failed: %s"
-msgstr "檢查 CRL 時失敗: %s"
+msgstr ""
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
-msgstr "有效性無效的憑證: %s"
+msgstr ""
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
-msgstr "憑證尚未生效"
+msgstr ""
+#: sm/certchain.c:1054 sm/certchain.c:1139
msgid "root certificate not yet valid"
-msgstr "根憑證尚未生效"
+msgstr ""
+#: sm/certchain.c:1055 sm/certchain.c:1140
msgid "intermediate certificate not yet valid"
-msgstr "媒介憑證尚未生效"
+msgstr ""
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
msgid "certificate has expired"
-msgstr "憑證已過期"
+msgstr ""
+#: sm/certchain.c:1069
msgid "root certificate has expired"
-msgstr "根憑證已過期"
+msgstr ""
+#: sm/certchain.c:1070
msgid "intermediate certificate has expired"
-msgstr "媒介憑證已過期"
+msgstr ""
+#: sm/certchain.c:1112
#, c-format
msgid "required certificate attributes missing: %s%s%s"
-msgstr "遺失所需的憑證屬性: %s%s%s"
+msgstr ""
+#: sm/certchain.c:1121
msgid "certificate with invalid validity"
-msgstr "有效性無效的憑證"
+msgstr ""
+#: sm/certchain.c:1158
msgid "signature not created during lifetime of certificate"
-msgstr "簽章並非在憑證生存時間內所造"
+msgstr ""
+#: sm/certchain.c:1160
msgid "certificate not created during lifetime of issuer"
-msgstr "憑證並非在發行者生存時間內所造"
+msgstr ""
+#: sm/certchain.c:1161
msgid "intermediate certificate not created during lifetime of issuer"
-msgstr "媒介憑證並非在發行者生存時間內所造"
+msgstr ""
+#: sm/certchain.c:1165
msgid " ( signature created at "
-msgstr " ( 簽章建立於 "
+msgstr ""
+#: sm/certchain.c:1166
msgid " (certificate created at "
-msgstr " ( 憑證建立於 "
+msgstr ""
+#: sm/certchain.c:1169
msgid " (certificate valid from "
-msgstr " (憑證有效自 "
+msgstr ""
+#: sm/certchain.c:1170
msgid " ( issuer valid from "
-msgstr " ( 發行者有效自 "
+msgstr ""
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, c-format
msgid "fingerprint=%s\n"
-msgstr "指紋=%s\n"
+msgstr ""
+#: sm/certchain.c:1209
msgid "root certificate has now been marked as trusted\n"
-msgstr "根憑證現在已標記為已信任\n"
+msgstr ""
+#: sm/certchain.c:1222
msgid "interactive marking as trusted not enabled in gpg-agent\n"
-msgstr "在 gpg-agent 中未啟用互動式標記為已信任\n"
+msgstr ""
+#: sm/certchain.c:1228
msgid "interactive marking as trusted disabled for this session\n"
-msgstr "互動式標記為已信任在此作業階段中已停用\n"
+msgstr ""
+#: sm/certchain.c:1286
msgid "WARNING: creation time of signature not known - assuming current time"
-msgstr "警告: 簽章創造時間未知 - 假設為此刻"
+msgstr ""
+#: sm/certchain.c:1350
msgid "no issuer found in certificate"
-msgstr "憑證中找不到發行者"
+msgstr ""
+#: sm/certchain.c:1428
msgid "self-signed certificate has a BAD signature"
-msgstr "自簽憑證有 不良 簽章"
+msgstr ""
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
-msgstr "根憑證未標記為已信任"
+msgstr ""
+#: sm/certchain.c:1513
#, c-format
msgid "checking the trust list failed: %s\n"
-msgstr "檢查信任清單時失敗: %s\n"
+msgstr ""
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
-msgstr "憑證鏈太長\n"
+msgstr ""
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
-msgstr "找不到發行者憑證"
+msgstr ""
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
msgid "certificate has a BAD signature"
-msgstr "憑證有 不良 簽章"
+msgstr ""
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
-msgstr "找到了另一個可能吻合的 CA 憑證 - 正再試一次"
+msgstr ""
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
-msgstr "憑證鏈比 CA 所允許的 (%d) 還長"
+msgstr ""
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
msgid "certificate is good\n"
-msgstr "憑證完好\n"
+msgstr ""
+#: sm/certchain.c:1723
msgid "intermediate certificate is good\n"
-msgstr "媒介憑證良好\n"
+msgstr ""
+#: sm/certchain.c:1724
msgid "root certificate is good\n"
-msgstr "根憑證完好\n"
+msgstr ""
+#: sm/certchain.c:1906
msgid "switching to chain model"
-msgstr "切換至鏈模型"
+msgstr ""
+#: sm/certchain.c:1915
#, c-format
msgid "validation model used: %s"
-msgstr "已使用的驗證模型: %s"
+msgstr ""
+#: sm/certcheck.c:107
#, c-format
msgid "a %u bit hash is not valid for a %u bit %s key\n"
-msgstr "%u 位元的雜湊對 %u 位元的 %s 金鑰來說是無效的\n"
+msgstr ""
+#: sm/certcheck.c:244 sm/verify.c:202
msgid "(this is the MD2 algorithm)\n"
-msgstr "(這是 MD2 演算法)\n"
+msgstr ""
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
msgid "none"
-msgstr "無"
+msgstr ""
+#: sm/certdump.c:552 sm/certdump.c:617
msgid "[Error - invalid encoding]"
-msgstr "[錯誤 - 無效的編碼]"
+msgstr ""
+#: sm/certdump.c:560
msgid "[Error - out of core]"
-msgstr "[錯誤 - 超出核心]"
+msgstr ""
+#: sm/certdump.c:596
msgid "[Error - No name]"
-msgstr "[錯誤 - 沒有名稱]"
+msgstr ""
+#: sm/certdump.c:623
msgid "[Error - invalid DN]"
-msgstr "[錯誤 - 無效的 DN]"
+msgstr ""
+#: sm/certdump.c:833
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@@ -7697,131 -6233,108 +7642,131 @@@
"S/N %s, ID 0x%08lX,\n"
"created %s, expires %s.\n"
msgstr ""
-"請輸入密語來解開 X.509 憑證所需的私鑰:\n"
-"\"%s\"\n"
-"S/N %s, ID 0x%08lX,\n"
-"建立於 %s, 於 %s 到期.\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
-msgstr "沒有指定的金鑰用途 - 假設為所有的用途\n"
+msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, c-format
msgid "error getting key usage information: %s\n"
-msgstr "取得金鑰用途資訊時出錯: %s\n"
+msgstr ""
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
-msgstr "憑證應該還未被用於憑證\n"
+msgstr ""
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
-msgstr "憑證應該還未被用於 OCSP 回應簽署\n"
+msgstr ""
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
-msgstr "憑證應該還未被用於加密\n"
+msgstr ""
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
-msgstr "憑證應該還未被用於簽署\n"
+msgstr ""
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
-msgstr "憑證無法用於加密\n"
+msgstr ""
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
-msgstr "憑證無法用於簽署\n"
+msgstr ""
+#: sm/certreqgen.c:464
#, c-format
msgid "line %d: invalid algorithm\n"
-msgstr "第 %d 列: 無效的演算法\n"
+msgstr ""
+#: sm/certreqgen.c:478
#, c-format
msgid "line %d: invalid key length %u (valid are %d to %d)\n"
-msgstr "第 %d 列: 金鑰長度 %u 無效 (有效範圍是從 %d 至 %d)\n"
+msgstr ""
+#: sm/certreqgen.c:496
#, c-format
msgid "line %d: no subject name given\n"
-msgstr "第 %d 列: 沒有給定的物件名稱\n"
+msgstr ""
+#: sm/certreqgen.c:505
#, c-format
msgid "line %d: invalid subject name label '%.*s'\n"
-msgstr "第 %d 列: 無效的主旨名稱標籤 '%.*s'\n"
+msgstr ""
+#: sm/certreqgen.c:508
#, c-format
msgid "line %d: invalid subject name '%s' at pos %d\n"
-msgstr "第 %d 列: 無效的主旨名稱 '%s' 於第 %d 位置\n"
+msgstr ""
+#: sm/certreqgen.c:525
#, c-format
msgid "line %d: not a valid email address\n"
-msgstr "第 %d 列: 不是有效的電子郵件地址\n"
+msgstr ""
+#: sm/certreqgen.c:544
#, c-format
msgid "line %d: invalid serial number\n"
-msgstr "第 %d 列: 無效的序號\n"
+msgstr ""
+#: sm/certreqgen.c:560
#, c-format
msgid "line %d: invalid issuer name label '%.*s'\n"
-msgstr "第 %d 列: 無效的發行者名稱標籤 '%.*s'\n"
+msgstr ""
+#: sm/certreqgen.c:563
#, c-format
msgid "line %d: invalid issuer name '%s' at pos %d\n"
-msgstr "第 %d 列: 無效的發行者名稱 '%s' 於第 %d 位置\n"
+msgstr ""
+#: sm/certreqgen.c:575 sm/certreqgen.c:586
#, c-format
msgid "line %d: invalid date given\n"
-msgstr "第 %d 列: 無效的給定日期\n"
+msgstr ""
+#: sm/certreqgen.c:599
#, c-format
msgid "line %d: error getting signing key by keygrip '%s': %s\n"
-msgstr "第 %d 列: 以金鑰鑰柄 '%s' 取得簽署金鑰時出錯: %s\n"
+msgstr ""
+#: sm/certreqgen.c:618
#, c-format
msgid "line %d: invalid hash algorithm given\n"
-msgstr "第 %d 列: 無效的給定雜湊演算法\n"
+msgstr ""
+#: sm/certreqgen.c:633
#, c-format
msgid "line %d: invalid authority-key-id\n"
-msgstr "第 %d 列: 無效的 authority-key-id\n"
+msgstr ""
+#: sm/certreqgen.c:648
#, c-format
msgid "line %d: invalid subject-key-id\n"
-msgstr "第 %d 列: 無效的 subject-key-id\n"
+msgstr ""
+#: sm/certreqgen.c:686
#, c-format
msgid "line %d: invalid extension syntax\n"
-msgstr "第 %d 列: 無效的擴充語法\n"
+msgstr ""
+#: sm/certreqgen.c:699
#, c-format
msgid "line %d: error reading key '%s' from card: %s\n"
-msgstr "第 %d 列: 從卡片讀取金鑰 '%s' 時出錯: %s\n"
+msgstr ""
+#: sm/certreqgen.c:712
#, c-format
msgid "line %d: error getting key by keygrip '%s': %s\n"
-msgstr "第 %d 列: 以金鑰鑰柄 '%s' 取得金鑰時出錯: %s\n"
+msgstr ""
+#: sm/certreqgen.c:729
#, c-format
msgid "line %d: key generation failed: %s <%s>\n"
-msgstr "第 %d 列: 金鑰產生失敗: %s <%s>\n"
+msgstr ""
+#: sm/certreqgen.c:1324
msgid ""
"To complete this certificate request please enter the passphrase for the key "
"you just created once more.\n"
@@@ -8114,126 -6561,103 +8059,126 @@@ msgid "
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
"Default operation depends on the input data\n"
msgstr ""
-"語法: @GPGSM@ [選項] [檔案]\n"
-"用 S/MIME 協定來簽署, 檢查, 加密, 解密\n"
-"預設的操作會依輸入資料而定\n"
+#: sm/gpgsm.c:771
#, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
-msgstr "請注意: 將無法加密為 '%s': %s\n"
+msgstr ""
+#: sm/gpgsm.c:782
#, c-format
msgid "unknown validation model '%s'\n"
-msgstr "未知的驗證模型 '%s'\n"
+msgstr ""
+#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
-msgstr "%s:%u: 沒有給定主機名稱\n"
+msgstr ""
+#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: 給定的密碼沒有使用者\n"
+msgstr ""
+#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: 正在跳過這一列\n"
+msgstr ""
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
msgid "could not parse keyserver\n"
-msgstr "無法剖析金鑰伺服器\n"
+msgstr ""
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, c-format
msgid "importing common certificates '%s'\n"
-msgstr "正在匯入通用憑證 '%s'\n"
+msgstr ""
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, c-format
msgid "can't sign using '%s': %s\n"
-msgstr "無法用 '%s' 來簽署: %s\n"
+msgstr ""
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
-msgstr "無效的指令 (沒有這樣的指令)\n"
+msgstr ""
+#: sm/import.c:127
#, c-format
msgid "total number processed: %lu\n"
-msgstr "處理總量: %lu\n"
+msgstr ""
+#: sm/import.c:246
msgid "error storing certificate\n"
-msgstr "存放憑證時出錯\n"
+msgstr ""
+#: sm/import.c:254
msgid "basic certificate checks failed - not imported\n"
-msgstr "基本的憑證檢查失敗了 - 未匯入\n"
+msgstr ""
+#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, c-format
msgid "error getting stored flags: %s\n"
-msgstr "取得已存放的旗標時出錯: %s\n"
+msgstr ""
+#: sm/import.c:526 sm/import.c:558
#, c-format
msgid "error importing certificate: %s\n"
-msgstr "匯入憑證時出錯: %s\n"
+msgstr ""
+#: sm/import.c:746 tools/gpg-connect-agent.c:1433
#, c-format
msgid "error reading input: %s\n"
-msgstr "讀取輸入時出錯: %s\n"
+msgstr ""
+#: sm/keydb.c:1120 sm/keydb.c:1206
msgid "failed to get the fingerprint\n"
-msgstr "取得指紋失敗\n"
+msgstr ""
+#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
-msgstr "查找既有憑證的問題: %s\n"
+msgstr ""
+#: sm/keydb.c:1174
#, c-format
msgid "error finding writable keyDB: %s\n"
-msgstr "尋找可寫入的 keyDB 時出錯: %s\n"
+msgstr ""
+#: sm/keydb.c:1182
#, c-format
msgid "error storing certificate: %s\n"
-msgstr "存放憑證時出錯: %s\n"
+msgstr ""
+#: sm/keydb.c:1234
#, c-format
msgid "problem re-searching certificate: %s\n"
-msgstr "重新搜尋憑證的問題: %s\n"
+msgstr ""
+#: sm/keydb.c:1255 sm/keydb.c:1344
#, c-format
msgid "error storing flags: %s\n"
-msgstr "存放旗標時出錯: %s\n"
+msgstr ""
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
-msgstr "錯誤 - "
+msgstr ""
+#: sm/misc.c:58
msgid "GPG_TTY has not been set - using maybe bogus default\n"
-msgstr "尚未設定 GPG_TTY - 使用可能是偽造的預設值\n"
+msgstr ""
+#: sm/qualified.c:105
#, c-format
msgid "invalid formatted fingerprint in '%s', line %d\n"
-msgstr "無效的格式化指紋於 '%s', 第 %d 列\n"
+msgstr ""
+#: sm/qualified.c:123
#, c-format
msgid "invalid country code in '%s', line %d\n"
-msgstr "無效的國家代碼於 '%s', 第 %d 列\n"
+msgstr ""
+#: sm/qualified.c:206
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@@ -8257,560 -6684,443 +8202,555 @@@ msgid "
"\"%s\"\n"
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-"你正要用你的這個憑證來建立簽章:\n"
-"\"%s\"\n"
-"請注意, 這個憑證並 不會 建立出合格的簽章!"
+#: sm/sign.c:451
#, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
-msgstr "雜湊演算法 %d (%s) 為簽署者 %d 所用, 但並不支援; 改用 %s\n"
+msgstr ""
+#: sm/sign.c:465
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
-msgstr "簽署者 %d 所用的雜湊演算法: %s (%s)\n"
+msgstr ""
+#: sm/sign.c:517
#, c-format
msgid "checking for qualified certificate failed: %s\n"
-msgstr "檢查合格憑證時失敗: %s\n"
+msgstr ""
+#: sm/verify.c:450
msgid "Signature made "
-msgstr "簽章建立於 "
+msgstr ""
+#: sm/verify.c:454
msgid "[date not given]"
-msgstr "[ 未給定日期 ]"
+msgstr ""
+#: sm/verify.c:455
#, c-format
msgid " using certificate ID 0x%08lX\n"
-msgstr " 以憑證 ID 0x%08lX\n"
+msgstr ""
+#: sm/verify.c:474
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
-msgstr "無效的簽章: 訊息摘要屬性與計算而得的不吻合\n"
+msgstr ""
+#: sm/verify.c:595
msgid "Good signature from"
-msgstr "完好的簽章來自於"
+msgstr ""
+#: sm/verify.c:596
msgid " aka"
-msgstr " 亦即"
+msgstr ""
+#: sm/verify.c:614
msgid "This is a qualified signature\n"
-msgstr "這是一份合格簽章\n"
+msgstr ""
+#: dirmngr/certcache.c:106
#, c-format
msgid "can't initialize certificate cache lock: %s\n"
-msgstr "無法啟始憑證快取鎖定: %s\n"
+msgstr ""
+#: dirmngr/certcache.c:117
#, c-format
msgid "can't acquire read lock on the certificate cache: %s\n"
-msgstr "無法取得憑證快取的讀取鎖定: %s\n"
+msgstr ""
+#: dirmngr/certcache.c:128
#, c-format
msgid "can't acquire write lock on the certificate cache: %s\n"
-msgstr "無法取得憑證快取的寫入鎖定: %s\n"
+msgstr ""
+#: dirmngr/certcache.c:139
#, c-format
msgid "can't release lock on the certificate cache: %s\n"
-msgstr "無法釋放憑證快取鎖定: %s\n"
+msgstr ""
+#: dirmngr/certcache.c:267
#, c-format
msgid "dropping %u certificates from the cache\n"
-msgstr "正在從快取中拋棄 %u 份憑證\n"
+msgstr ""
- #: dirmngr/certcache.c:352
- #, c-format
- msgid "can't access directory '%s': %s\n"
- msgstr ""
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, c-format
msgid "can't parse certificate '%s': %s\n"
-msgstr "無法剖析憑證 '%s': %s\n"
+msgstr ""
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, c-format
msgid "certificate '%s' already cached\n"
-msgstr "憑證 '%s' 已快取\n"
+msgstr ""
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, c-format
msgid "trusted certificate '%s' loaded\n"
-msgstr "信任的憑證 '%s' 已載入\n"
+msgstr ""
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, c-format
msgid "certificate '%s' loaded\n"
-msgstr "憑證 '%s' 已載入\n"
+msgstr ""
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, c-format
msgid " SHA1 fingerprint = %s\n"
-msgstr " SHA1 指紋 = %s\n"
+msgstr ""
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
-msgstr " 發行者 ="
+msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
-msgstr " 主旨 ="
+msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, c-format
msgid "error loading certificate '%s': %s\n"
-msgstr "載入憑證 '%s' 時出錯: %s\n"
+msgstr ""
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, c-format
msgid "permanently loaded certificates: %u\n"
-msgstr "固定載入的憑證: %u\n"
+msgstr ""
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, c-format
msgid " runtime cached certificates: %u\n"
-msgstr " 執行時期快取的憑證: %u\n"
+msgstr ""
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
msgid "certificate already cached\n"
-msgstr "憑證早已快取\n"
+msgstr ""
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
msgid "certificate cached\n"
-msgstr "憑證已快取\n"
+msgstr ""
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, c-format
msgid "error caching certificate: %s\n"
-msgstr "快取憑證時出錯: %s\n"
+msgstr ""
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
-msgstr "無效的 SHA1 指紋字串 '%s'\n"
+msgstr ""
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, c-format
msgid "error fetching certificate by S/N: %s\n"
-msgstr "以序號取得憑證時出錯: %s\n"
+msgstr ""
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, c-format
msgid "error fetching certificate by subject: %s\n"
-msgstr "以主旨取得憑證時出錯: %s\n"
+msgstr ""
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
msgid "no issuer found in certificate\n"
-msgstr "憑證中找不到發行者\n"
+msgstr ""
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
-msgstr "取得 authorityKeyIdentifier 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:213
#, c-format
msgid "creating directory '%s'\n"
-msgstr "正在建立目錄 '%s'\n"
+msgstr ""
+#: dirmngr/crlcache.c:217
#, c-format
msgid "error creating directory '%s': %s\n"
-msgstr "建立目錄 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:245
#, c-format
msgid "ignoring database dir '%s'\n"
-msgstr "正在忽略資料庫目錄 '%s'\n"
+msgstr ""
+#: dirmngr/crlcache.c:254
#, c-format
msgid "error reading directory '%s': %s\n"
-msgstr "讀取目錄 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:275
#, c-format
msgid "removing cache file '%s'\n"
-msgstr "正在移除快取檔案 '%s'\n"
+msgstr ""
+#: dirmngr/crlcache.c:284
#, c-format
msgid "not removing file '%s'\n"
-msgstr "不移除檔案 '%s'\n"
+msgstr ""
+#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
#, c-format
msgid "error closing cache file: %s\n"
-msgstr "關閉快取檔案時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
#, c-format
msgid "failed to open cache dir file '%s': %s\n"
-msgstr "開啟快取目錄檔案 '%s' 失敗: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:421
#, c-format
msgid "error creating new cache dir file '%s': %s\n"
-msgstr "建立新快取目錄檔案 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:428
#, c-format
msgid "error writing new cache dir file '%s': %s\n"
-msgstr "寫入新快取目錄檔案 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:435
#, c-format
msgid "error closing new cache dir file '%s': %s\n"
-msgstr "關閉新快取目錄檔案 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:440
#, c-format
msgid "new cache dir file '%s' created\n"
-msgstr "新的快取目錄檔案 '%s' 已建立\n"
+msgstr ""
+#: dirmngr/crlcache.c:445
#, c-format
msgid "failed to re-open cache dir file '%s': %s\n"
-msgstr "重新開啟快取目錄檔案 '%s' 失敗: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:473
#, c-format
msgid "first record of '%s' is not the version\n"
-msgstr "第一個 '%s' 記錄並非版本\n"
+msgstr ""
+#: dirmngr/crlcache.c:488
msgid "old version of cache directory - cleaning up\n"
-msgstr "舊版的快取目錄 - 正在清理\n"
+msgstr ""
+#: dirmngr/crlcache.c:504
msgid "old version of cache directory - giving up\n"
-msgstr "舊版的快取目錄 - 正在放棄\n"
+msgstr ""
+#: dirmngr/crlcache.c:615
#, c-format
msgid "extra field detected in crl record of '%s' line %u\n"
-msgstr "'%s' 的 crl 記錄內偵測到額外的欄位位於第 %u 列\n"
+msgstr ""
+#: dirmngr/crlcache.c:623
#, c-format
msgid "invalid line detected in '%s' line %u\n"
-msgstr "偵測到 '%s' 第 %u 列有無效的列\n"
+msgstr ""
+#: dirmngr/crlcache.c:632
#, c-format
msgid "duplicate entry detected in '%s' line %u\n"
-msgstr "偵測到 '%s' 第 %u 列有重複的項目\n"
+msgstr ""
+#: dirmngr/crlcache.c:647
#, c-format
msgid "unsupported record type in '%s' line %u skipped\n"
-msgstr "'%s' 第 %u 列有未支援的紀錄類型故已跳過\n"
+msgstr ""
+#: dirmngr/crlcache.c:673
#, c-format
msgid "invalid issuer hash in '%s' line %u\n"
-msgstr "'%s' 第 %u 列有無效的發行者雜湊\n"
+msgstr ""
+#: dirmngr/crlcache.c:679
#, c-format
msgid "no issuer DN in '%s' line %u\n"
-msgstr "'%s' 第 %u 列沒有發行者 DN\n"
+msgstr ""
+#: dirmngr/crlcache.c:686
#, c-format
msgid "invalid timestamp in '%s' line %u\n"
-msgstr "'%s' 第 %u 列有無效的時間戳印\n"
+msgstr ""
+#: dirmngr/crlcache.c:692
#, c-format
msgid "WARNING: invalid cache file hash in '%s' line %u\n"
-msgstr "警告: '%s' 第 %u 列有無效的快取檔案雜湊\n"
+msgstr ""
+#: dirmngr/crlcache.c:698
msgid "detected errors in cache dir file\n"
-msgstr "已於快取 dir 檔案內偵測到錯誤\n"
+msgstr ""
+#: dirmngr/crlcache.c:699
msgid "please check the reason and manually delete that file\n"
-msgstr "請檢查其原因並手動刪除該檔案\n"
+msgstr ""
+#: dirmngr/crlcache.c:827 dirmngr/crlcache.c:841
#, c-format
msgid "failed to create temporary cache dir file '%s': %s\n"
-msgstr "建立暫存快取目錄檔案 '%s' 失敗: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:937
#, c-format
msgid "error closing '%s': %s\n"
-msgstr "關閉 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:949
#, c-format
msgid "error renaming '%s' to '%s': %s\n"
-msgstr "把 '%s' 重新命名成 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1003
#, c-format
msgid "can't hash '%s': %s\n"
-msgstr "無法計算 '%s' 的雜湊: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1011
#, c-format
msgid "error setting up MD5 hash context: %s\n"
-msgstr "設定 MD5 雜湊脈絡時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1027
#, c-format
msgid "error hashing '%s': %s\n"
-msgstr "計算 '%s' 的雜湊時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1055
#, c-format
msgid "invalid formatted checksum for '%s'\n"
-msgstr "無效的 '%s' 格式化加總檢核碼\n"
+msgstr ""
+#: dirmngr/crlcache.c:1108
msgid "too many open cache files; can't open anymore\n"
-msgstr "太多開啟的快取檔案; 無法再開啟更多檔案了\n"
+msgstr ""
+#: dirmngr/crlcache.c:1126
#, c-format
msgid "opening cache file '%s'\n"
-msgstr "開啟快取檔案 '%s' 時失敗\n"
+msgstr ""
+#: dirmngr/crlcache.c:1145
#, c-format
msgid "error opening cache file '%s': %s\n"
-msgstr "開啟快取檔案 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1154
#, c-format
msgid "error initializing cache file '%s' for reading: %s\n"
-msgstr "初始化快取檔案 '%s' 用於讀取時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1175
msgid "calling unlock_db_file on a closed file\n"
-msgstr "正在對已關閉的檔案叫用 unlock_db_file\n"
+msgstr ""
+#: dirmngr/crlcache.c:1177
msgid "calling unlock_db_file on an unlocked file\n"
-msgstr "正在對已解除鎖定的檔案叫用 unlock_db_file\n"
+msgstr ""
+#: dirmngr/crlcache.c:1231
#, c-format
msgid "failed to create a new cache object: %s\n"
-msgstr "建立新快取物件失敗: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1286
#, c-format
msgid "no CRL available for issuer id %s\n"
-msgstr "發行者 ID %s 沒有可用的 CRL\n"
+msgstr ""
+#: dirmngr/crlcache.c:1293
#, c-format
msgid "cached CRL for issuer id %s too old; update required\n"
-msgstr "發行者 ID %s 的快取 CRL 太過老舊; 需要更新\n"
+msgstr ""
+#: dirmngr/crlcache.c:1307
#, c-format
msgid ""
"force-crl-refresh active and %d minutes passed for issuer id %s; update "
"required\n"
-msgstr "force-crl-refresh 啟用且已經過 %d 分鐘 (發行者 ID %s); 需要更新\n"
+msgstr ""
+#: dirmngr/crlcache.c:1315
#, c-format
msgid "force-crl-refresh active for issuer id %s; update required\n"
-msgstr "force-crl-refresh 啟用 (發行者 ID %s); 需要更新\n"
+msgstr ""
+#: dirmngr/crlcache.c:1324
#, c-format
msgid "available CRL for issuer ID %s can't be used\n"
-msgstr "發行者 ID %s 的可用 CRL 無法使用\n"
+msgstr ""
+#: dirmngr/crlcache.c:1335
#, c-format
msgid "cached CRL for issuer id %s tampered; we need to update\n"
-msgstr "發行者 ID %s 的快取 CRL 已遭竄改; 我們需要更新\n"
+msgstr ""
+#: dirmngr/crlcache.c:1347
msgid "WARNING: invalid cache record length for S/N "
-msgstr "警告: 快取記錄長度無效, S/N"
+msgstr ""
+#: dirmngr/crlcache.c:1357
#, c-format
msgid "problem reading cache record for S/N %s: %s\n"
-msgstr "讀取序號 %s 的快取記錄時發生問題: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1360
#, c-format
msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
-msgstr "S/N %s 無效; 原因=%02X 日期=%.15s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1371
#, c-format
msgid "S/N %s is valid, it is not listed in the CRL\n"
-msgstr "S/N %s 有效, 但位列入 CRL 內\n"
+msgstr ""
+#: dirmngr/crlcache.c:1379
#, c-format
msgid "error getting data from cache file: %s\n"
-msgstr "從快取檔案取得資料時出錯: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, c-format
msgid "unknown hash algorithm '%s'\n"
-msgstr "未知的雜湊演算法 '%s'\n"
+msgstr ""
+#: dirmngr/crlcache.c:1549
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr "演算法 %d 的 gcry_md_open 失敗: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1586 dirmngr/crlcache.c:1605
msgid "got an invalid S-expression from libksba\n"
-msgstr "從 libksba 得到無效的 S-表示式\n"
+msgstr ""
+#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
#, c-format
msgid "converting S-expression failed: %s\n"
-msgstr "轉換 S-表示式時失敗: %s\n"
+msgstr ""
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, c-format
msgid "creating S-expression failed: %s\n"
-msgstr "建立 S-表示式時失敗: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1699
#, c-format
msgid "ksba_crl_parse failed: %s\n"
-msgstr "ksba_crl_parse 失敗: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1714
#, c-format
msgid "error getting update times of CRL: %s\n"
-msgstr "取得 CRL 更新時間時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1721
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
-msgstr "此 CRL 的更新時間: 本次=%s 下次=%s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1725
msgid "nextUpdate not given; assuming a validity period of one day\n"
-msgstr "無給定 nextUpdate; 先假設有效期是一天\n"
+msgstr ""
+#: dirmngr/crlcache.c:1745
#, c-format
msgid "error getting CRL item: %s\n"
-msgstr "取得 CRL 項目時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1760
#, c-format
msgid "error inserting item into temporary cache file: %s\n"
-msgstr "安插項目至暫存快取檔案時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1787
#, c-format
msgid "no CRL issuer found in CRL: %s\n"
-msgstr "CRL 中找不到 CRL 發行者: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1802
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
-msgstr "正在以 authorityKeyIdentifier 找出 CRL 發行者憑證位置\n"
+msgstr ""
+#: dirmngr/crlcache.c:1847
#, c-format
msgid "CRL signature verification failed: %s\n"
-msgstr "CRL 簽章驗證失敗: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:1858
#, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
-msgstr "檢查 CRL 發行者憑證有效性時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:2001
#, c-format
msgid "ksba_crl_new failed: %s\n"
-msgstr "ksba_crl_new 失敗: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:2008
#, c-format
msgid "ksba_crl_set_reader failed: %s\n"
-msgstr "ksba_crl_set_reader 失敗: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:2042
#, c-format
msgid "removed stale temporary cache file '%s'\n"
-msgstr "已移除陳舊的暫存快取檔案 '%s'\n"
+msgstr ""
+#: dirmngr/crlcache.c:2046
#, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
-msgstr "移除陳舊的暫存快取檔案 '%s' 時發生問題: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:2056
#, c-format
msgid "error creating temporary cache file '%s': %s\n"
-msgstr "建立暫存快取檔案 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:2066
#, c-format
msgid "crl_parse_insert failed: %s\n"
-msgstr "crl_parse_insert 失敗: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:2076
#, c-format
msgid "error finishing temporary cache file '%s': %s\n"
-msgstr "完成暫存快取檔案 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:2083
#, c-format
msgid "error closing temporary cache file '%s': %s\n"
-msgstr "關閉暫存快取檔案 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:2108
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
-msgstr "警告: 新的 CRL 仍然太老舊; 早已在 %s 逾期 - 不過還是載入\n"
+msgstr ""
+#: dirmngr/crlcache.c:2112
#, c-format
msgid "new CRL still too old; it expired on %s\n"
-msgstr "新的 CRL 仍然太老舊; 早已在 %s 逾期\n"
+msgstr ""
+#: dirmngr/crlcache.c:2128
#, c-format
msgid "unknown critical CRL extension %s\n"
-msgstr "未知的關鍵 CRL 擴充欄位 %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:2138
#, c-format
msgid "error reading CRL extensions: %s\n"
-msgstr "讀取 CRL 擴充欄位時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:2189
#, c-format
msgid "creating cache file '%s'\n"
-msgstr "建立快取檔案 '%s' 時出錯\n"
+msgstr ""
+#: dirmngr/crlcache.c:2221
#, c-format
msgid "problem renaming '%s' to '%s': %s\n"
-msgstr "把 '%s' 重新新命成 '%s' 時發生問題: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:2235
msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
@@@ -8982,1151 -7255,900 +8922,1143 @@@ msgid "
"The process returns 0 if the certificate is valid, 1 if it is\n"
"not valid and other error codes for general failures\n"
msgstr ""
-"語法: dirmngr-client [選項] [憑證檔案|模式]\n"
-"以 CRL 測試 X.509 憑證, 或進行 OCSP 檢查\n"
-"如果憑證有效, 此程序將傳回 0; 如果憑證無效\n"
-"則傳回 1; 其他錯誤代碼則代表不同的一般性失敗\n"
+#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
#, c-format
msgid "error reading certificate from stdin: %s\n"
-msgstr "從標準輸入讀取憑證時出錯: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:281
#, c-format
msgid "error reading certificate from '%s': %s\n"
-msgstr "從 '%s' 讀取憑證時出錯: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
-msgstr "憑證大到全然不合理的境界\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:310
#, c-format
msgid "can't connect to the dirmngr: %s\n"
-msgstr "無法連接至 dirmngr: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:332
#, c-format
msgid "lookup failed: %s\n"
-msgstr "查找失敗: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:347
#, c-format
msgid "loading CRL '%s' failed: %s\n"
-msgstr "載入 CRL '%s' 時失敗: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:375
msgid "a dirmngr daemon is up and running\n"
-msgstr "有個 dirmngr 服務已啟動並正在執行中\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:397
#, c-format
msgid "validation of certificate failed: %s\n"
-msgstr "憑證之驗證失敗: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
msgid "certificate is valid\n"
-msgstr "憑證有效\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
msgid "certificate has been revoked\n"
-msgstr "憑證已遭撤銷\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
#, c-format
msgid "certificate check failed: %s\n"
-msgstr "憑證檢查失敗: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:428
#, c-format
msgid "got status: '%s'\n"
-msgstr "得到狀態: '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:443
#, c-format
msgid "error writing base64 encoding: %s\n"
-msgstr "寫入 base64 編碼時出錯: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:701
#, c-format
msgid "unsupported inquiry '%s'\n"
-msgstr "未支援的查詢 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:803
msgid "absolute file name expected\n"
-msgstr "應該要有絕對檔名\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:848
#, c-format
msgid "looking up '%s'\n"
-msgstr "正在查找 '%s'\n"
+msgstr ""
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr ""
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
-msgstr "列出 CRL 快取的內容"
+msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
msgid "|FILE|load CRL from FILE into cache"
-msgstr "|檔案|從指定檔案載入 CRL 至快取"
+msgstr ""
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
-msgstr "|網址|從指定網址取得 CRL"
+msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
-msgstr "關閉 dirmngr"
+msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
-msgstr "清除快取"
+msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
-msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
+msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
msgid "run without asking a user"
-msgstr "以不詢問使用者的方式執行"
+msgstr ""
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
-msgstr "強迫載入過時的 CRL"
+msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
-msgstr "允許送出 OCSP 請求"
+msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
-msgstr "避免使用 HTTP"
+msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
-msgstr "避免使用 LDAP"
+msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
-msgstr "忽略 HTTP CRL 分布點"
+msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
-msgstr "忽略 LDAP CRL 分布點"
+msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
-msgstr "忽略含有 OCSP 伺服器網址的憑證"
+msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
-msgstr "|網址|重新導向所有對指定網址提出的 HTTP 請求"
+msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
-msgstr "|主機|指定 LDAP 查詢主機"
+msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
-msgstr "不要將主機備案與 --ldap-proxy 並用"
+msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
msgid "|FILE|read LDAP server list from FILE"
-msgstr "|檔案|從指定檔案讀取 LDAP 伺服器清單"
+msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
-msgstr "將從 CRL 分布點發現的新伺服器加入至伺服器清單"
+msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
-msgstr "|N|把 LDAP 逾時設成 N 秒"
+msgstr ""
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
msgid "|URL|use OCSP responder at URL"
-msgstr "|網址|使用位於指定網址的 OCSP 回應程式"
+msgstr ""
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
-msgstr "|FPR|由 FPR 簽署的 OCSP 回應"
+msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
-msgstr "|N|單次查詢不要傳回超過 N 筆項目"
+msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
-msgstr "|檔案|在 HKP over TLS 的指定檔案中使用 CA 憑證"
+msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
"options)\n"
msgstr ""
-"@\n"
-"(請參照「資訊」手冊來取得所有命令和選項的完整清單)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
-msgstr "用法: @DIRMNGR@ [選項] (或用 -h 求助)"
+msgstr ""
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
-"語法: @DIRMNGR@ [選項] [指令 [引數]]\n"
-"@GNUPG@ 的金鑰伺服器, CRL, OCSP 存取\n"
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
-msgstr "有效的除錯等級為: %s\n"
+msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, c-format
msgid "usage: %s [options] "
-msgstr "用法: %s [選項] "
+msgstr ""
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
msgid "colons are not allowed in the socket name\n"
-msgstr "socket 名稱內不允許使用冒號\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
-msgstr "從 '%s' 取回 CRL 時失敗: %s\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
-msgstr "從 '%s' 處理 CRL 時失敗: %s\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, c-format
msgid "%s:%u: line too long - skipped\n"
-msgstr "%s:%u: 列太長 - 已跳過\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
-msgstr "%s:%u: 偵測到無效的指紋\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, c-format
msgid "%s:%u: read error: %s\n"
-msgstr "%s:%u: 讀取錯誤: %s\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
-msgstr "%s:%u: 列尾的垃圾已忽略\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
-msgstr "收到 SIGHUP - 正在重新讀取組態並清除快取\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
-msgstr "收到 SIGUSR2 - 無定義行動\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
-msgstr "收到 SIGTERM - 正在關閉 ...\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
-msgstr "收到 SIGTERM - 還有 %d 個使用中的連線\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
msgid "shutdown forced\n"
-msgstr "已強迫關閉\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
-msgstr "收到 SIGINT - 立即關閉\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
-msgstr "收到訊號 %d - 無定義行動\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:138
msgid "return all values in a record oriented format"
-msgstr "以記錄導向格式傳回所有數值"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:141
msgid "|NAME|ignore host part and connect through NAME"
-msgstr "|名稱|忽略主機的部份並改以指定名稱連線"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:142
msgid "|NAME|connect to host NAME"
-msgstr "|名稱|連線至位於指定名稱的主機"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:143
msgid "|N|connect to port N"
-msgstr "|N|連線至 N 連接埠"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:144
msgid "|NAME|use user NAME for authentication"
-msgstr "|名字|使用指定名字做為認證用的使用者名稱"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:145
msgid "|PASS|use password PASS for authentication"
-msgstr "|密碼|使用指定密碼作為認證"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:147
msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr "從 $DIRMNGR_LDAP_PASS 取得密碼使用"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:148
msgid "|STRING|query DN STRING"
-msgstr "|字串|以只指定字串查詢 DN"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:149
msgid "|STRING|use STRING as filter expression"
-msgstr "|字串|以指定字串作為過濾器表示式"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:150
msgid "|STRING|return the attribute STRING"
-msgstr "|字串|以指定字串傳回屬性"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:209
msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "用法: dirmngr_ldap [選項] [網址] (或用 -h 求助)\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:212
msgid ""
"Syntax: dirmngr_ldap [options] [URL]\n"
"Internal LDAP helper for Dirmngr\n"
"Interface and options may change without notice\n"
msgstr ""
-"語法: dirmngr_ldap [選項] [網址]\n"
-"Dirmngr 的內部 LDAP 協助程式\n"
-"介面及選項均可能未經通知即變更\n"
+#: dirmngr/dirmngr_ldap.c:337
#, c-format
msgid "invalid port number %d\n"
-msgstr "無效的連接埠號碼 %d\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:413
#, c-format
msgid "scanning result for attribute '%s'\n"
-msgstr "正在掃描屬性 '%s' 之結果\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
+#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
+#: dirmngr/dirmngr_ldap.c:677
#, c-format
msgid "error writing to stdout: %s\n"
-msgstr "寫入標準輸出時出錯: %s\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:437
#, c-format
msgid " available attribute '%s'\n"
-msgstr " 可用屬性 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:475
#, c-format
msgid "attribute '%s' not found\n"
-msgstr "找不到屬性 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:482
#, c-format
msgid "found attribute '%s'\n"
-msgstr "找到屬性 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:591
#, c-format
msgid "processing url '%s'\n"
-msgstr "正在處理網址 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:593
#, c-format
msgid " user '%s'\n"
-msgstr " 使用者 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:595
#, c-format
msgid " pass '%s'\n"
-msgstr " 密碼 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:597
#, c-format
msgid " host '%s'\n"
-msgstr " 主機 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:598
#, c-format
msgid " port %d\n"
-msgstr " 連接埠 %d\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:600
#, c-format
msgid " DN '%s'\n"
-msgstr " 域名 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:602
#, c-format
msgid " filter '%s'\n"
-msgstr " 過濾器 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:607 dirmngr/dirmngr_ldap.c:610
#, c-format
msgid " attr '%s'\n"
-msgstr " 屬性 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:616
#, c-format
msgid "no host name in '%s'\n"
-msgstr "'%s' 中沒有主機名稱\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:621
#, c-format
msgid "no attribute given for query '%s'\n"
-msgstr "查詢 '%s' 無給定屬性\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:627
msgid "WARNING: using first attribute only\n"
-msgstr "警告: 僅使用第一個屬性\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:636
#, c-format
msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "LDAP 初始至 '%s:%d' 失敗: %s\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:659
#, c-format
msgid "binding to '%s:%d' failed: %s\n"
-msgstr "綁定至 '%s:%d' 時失敗: %s\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:686
#, c-format
msgid "searching '%s' failed: %s\n"
-msgstr "搜尋 '%s' 時失敗: %s\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:718
#, c-format
msgid "'%s' is not an LDAP URL\n"
-msgstr "'%s' 不是一個 LDAP 位址\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:724
#, c-format
msgid "'%s' is an invalid LDAP URL\n"
-msgstr "'%s' 是無效的 LDAP 網址\n"
+msgstr ""
+#: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
+#: dirmngr/ldap-wrapper.c:693
#, c-format
msgid "error allocating memory: %s\n"
-msgstr "配置記憶體時出錯: %s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:207
#, c-format
msgid "error printing log line: %s\n"
-msgstr "印出日誌記錄列時出錯: %s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:236
#, c-format
msgid "error reading log from ldap wrapper %d: %s\n"
-msgstr "從 ldap 封裝程式 %d 讀取日誌記錄時出錯: %s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:304
#, c-format
msgid "npth_select failed: %s - waiting 1s\n"
-msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:343
#, c-format
msgid "ldap wrapper %d ready"
-msgstr "ldap 封裝程式 %d 準備妥當"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:352
#, c-format
msgid "ldap wrapper %d ready: timeout\n"
-msgstr "ldap 封裝程式 %d 準備妥當: 逾時\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:355
#, c-format
msgid "ldap wrapper %d ready: exitcode=%d\n"
-msgstr "ldap 封裝程式 %d 準備妥當: 離開代碼=%d\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:364
#, c-format
msgid "waiting for ldap wrapper %d failed: %s\n"
-msgstr "等候 ldap 封裝程式 %d 時失敗: %s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:376
#, c-format
msgid "ldap wrapper %d stalled - killing\n"
-msgstr "ldap 封裝程式 %d 已卡住 - 正在中止\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:444
#, c-format
msgid "error spawning ldap wrapper reaper thread: %s\n"
-msgstr "繁衍 ldap 封裝程式收割執行緒時出錯: %s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:496 dirmngr/ldap-wrapper.c:517
#, c-format
msgid "reading from ldap wrapper %d failed: %s\n"
-msgstr "從 ldap 封裝程式 %d 讀取時失敗: %s\n"
+msgstr ""
+#: dirmngr/ldap.c:91
#, c-format
msgid "invalid char 0x%02x in host name - not added\n"
-msgstr "主機名稱中有無效的字符 0x%02x - 不予加入\n"
+msgstr ""
+#: dirmngr/ldap.c:95
#, c-format
msgid "adding '%s:%d' to the ldap server list\n"
-msgstr "正在加入 '%s:%d' 至 ldap 伺服器清單\n"
+msgstr ""
+#: dirmngr/ldap.c:98 dirmngr/misc.c:502
#, c-format
msgid "malloc failed: %s\n"
-msgstr "動態記憶體配置失敗: %s\n"
+msgstr ""
+#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr "start_cert_fetch: 無效的模式 '%s'\n"
+msgstr ""
+#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
-msgstr "ldap_search 達到伺服器的尺寸限制\n"
+msgstr ""
+#: dirmngr/misc.c:170
msgid "invalid canonical S-expression found\n"
-msgstr "發現無效的標準型 S-表示式\n"
+msgstr ""
+#: dirmngr/misc.c:194 dirmngr/misc.c:228
#, c-format
msgid "gcry_md_open failed: %s\n"
-msgstr "gcry_md_open 失敗: %s\n"
+msgstr ""
+#: dirmngr/misc.c:199 dirmngr/misc.c:233
#, c-format
msgid "oops: ksba_cert_hash failed: %s\n"
-msgstr "糟了: ksba_cert_hash 失敗: %s\n"
+msgstr ""
+#: dirmngr/misc.c:518
msgid "bad URL encoding detected\n"
-msgstr "偵測到不良的網址編碼\n"
+msgstr ""
+#: dirmngr/ocsp.c:80
#, c-format
msgid "error reading from responder: %s\n"
-msgstr "從回應程式讀取時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:98
#, c-format
msgid "response from server too large; limit is %d bytes\n"
-msgstr "來自伺服器的回應太大; 上限是 %d 位元組\n"
+msgstr ""
-#, fuzzy
-#| msgid "OCSP request not possible due to disabled HTTP\n"
+#: dirmngr/ocsp.c:139
msgid "OCSP request not possible due to Tor mode\n"
-msgstr "因為已經停用 HTTP 而不可能有 OCSP 請求\n"
+msgstr ""
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
-msgstr "因為已經停用 HTTP 而不可能有 OCSP 請求\n"
+msgstr ""
+#: dirmngr/ocsp.c:152
#, c-format
msgid "error setting OCSP target: %s\n"
-msgstr "設定 OCSP 目標時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:170
#, c-format
msgid "error building OCSP request: %s\n"
-msgstr "建立 OCSP 請求時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:181
#, c-format
msgid "error connecting to '%s': %s\n"
-msgstr "連線至 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
#, c-format
msgid "error reading HTTP response for '%s': %s\n"
-msgstr "讀取 '%s' HTTP 回應時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:240
#, c-format
msgid "error accessing '%s': http status %u\n"
-msgstr "存取 '%s' 時出錯: http 狀態 %u\n"
+msgstr ""
+#: dirmngr/ocsp.c:265
#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
-msgstr "剖析 '%s' OCSP 回應時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
#, c-format
msgid "OCSP responder at '%s' status: %s\n"
-msgstr "位於 '%s' 的 OSCP 回應程式狀態: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:293
#, c-format
msgid "hashing the OCSP response for '%s' failed: %s\n"
-msgstr "計算 '%s' OSCP 回應雜湊時失敗: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:328
msgid "not signed by a default OCSP signer's certificate"
-msgstr "並未由預設 OCSP 簽署者的憑證所簽署"
+msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
-msgstr "OCSP 回應僅支援 SHA-1\n"
+msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, c-format
msgid "allocating list item failed: %s\n"
-msgstr "配置清單項目時失敗: %s\n"
+msgstr ""
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, c-format
msgid "error getting responder ID: %s\n"
-msgstr "取得回應程式 ID 時出錯: %s\n"
+msgstr ""
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
-msgstr "找不到適合用來驗證 OCSP 回應的憑證\n"
+msgstr ""
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, c-format
msgid "issuer certificate not found: %s\n"
-msgstr "找不到發行者憑證: %s\n"
+msgstr ""
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
-msgstr "叫用者未傳為目標憑證\n"
+msgstr ""
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
msgid "caller did not return the issuing certificate\n"
-msgstr "叫用者未傳回發行的憑證\n"
+msgstr ""
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, c-format
msgid "failed to allocate OCSP context: %s\n"
-msgstr "配置 OCSP 脈絡失敗: %s\n"
+msgstr ""
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, c-format
msgid "can't get authorityInfoAccess: %s\n"
-msgstr "無法取得 authorityInfoAccess: %s\n"
+msgstr ""
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
-msgstr "無定義預設 OCSP 回應程式\n"
+msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
msgid "no default OCSP signer defined\n"
-msgstr "未定義預設的 OCSP 簽署程式\n"
+msgstr ""
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
-msgstr "正在使用預設的 OCSP 回應程式 '%s'\n"
+msgstr ""
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, c-format
msgid "using OCSP responder '%s'\n"
-msgstr "正在使用 %s OCSP 回應程式\n"
+msgstr ""
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
-msgstr "對 OCSP 建立雜湊脈絡失敗: %s\n"
+msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, c-format
msgid "error getting OCSP status for target certificate: %s\n"
-msgstr "取得目標憑證 OCSP 狀態時出錯: %s\n"
+msgstr ""
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
-msgstr "憑證狀態為: %s (本次=%s 下次=%s)\n"
+msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
-msgstr "良好"
+msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
-msgstr "憑證已撤銷於 %s 因: %s\n"
+msgstr ""
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
-msgstr "OCSP 回應程式傳回未來的狀態\n"
+msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
-msgstr "OCSP 回應程式傳回非當下的狀態\n"
+msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
-msgstr "OCSP 回應程式傳回老舊的狀態\n"
+msgstr ""
+#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
-msgstr "assuan_inquire(%s) 失敗: %s\n"
+msgstr ""
+#: dirmngr/server.c:893
msgid "ldapserver missing"
-msgstr "遺失 ldapserver"
+msgstr ""
+#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
-msgstr "憑證 ID 中遺失 serialno"
+msgstr ""
+#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
+#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, c-format
msgid "assuan_inquire failed: %s\n"
-msgstr "assuan_inquire 失敗: %s\n"
+msgstr ""
+#: dirmngr/server.c:1232
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
-msgstr "fetch_cert_by_url 失敗: %s\n"
+msgstr ""
+#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, c-format
msgid "error sending data: %s\n"
-msgstr "送出資料時出錯: %s\n"
+msgstr ""
+#: dirmngr/server.c:1382
#, c-format
msgid "start_cert_fetch failed: %s\n"
-msgstr "start_cert_fetch 失敗: %s\n"
+msgstr ""
+#: dirmngr/server.c:1415
#, c-format
msgid "fetch_next_cert failed: %s\n"
-msgstr "fetch_next_cert 失敗: %s\n"
+msgstr ""
+#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
-msgstr "max_replies %d 已超出\n"
+msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, c-format
msgid "can't allocate control structure: %s\n"
-msgstr "無法配置控制結構: %s\n"
+msgstr ""
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, c-format
msgid "failed to allocate assuan context: %s\n"
-msgstr "配置 assuan 脈絡失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, c-format
msgid "failed to initialize the server: %s\n"
-msgstr "伺服器啟始失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:2444
++#: dirmngr/server.c:2406
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
-msgstr "向 Assuan 註冊指令時失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
-msgstr "Assuan 接受問題: %s\n"
+msgstr ""
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, c-format
msgid "Assuan processing failed: %s\n"
-msgstr "Assuan 處理時失敗: %s\n"
+msgstr ""
+#: dirmngr/validate.c:201
msgid "accepting root CA not marked as a CA"
-msgstr "接受未標示為 CA 的根 CA"
+msgstr ""
+#: dirmngr/validate.c:227
msgid "CRL checking too deeply nested\n"
-msgstr "檢查 CRL 時遭遇太深層次的巢狀結構\n"
+msgstr ""
+#: dirmngr/validate.c:245
msgid "not checking CRL for"
-msgstr "不對此檢查 CRL:"
+msgstr ""
+#: dirmngr/validate.c:250
msgid "checking CRL for"
-msgstr "檢查 CRL: "
+msgstr ""
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
msgid "selfsigned certificate has a BAD signature"
-msgstr "自簽憑證有 不良 簽章"
+msgstr ""
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
-msgstr "檢查根憑證可信度時失敗: %s\n"
+msgstr ""
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
msgid "certificate chain is good\n"
-msgstr "憑證鏈完好\n"
+msgstr ""
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA 要求使用 160 位元的雜湊演算法\n"
+msgstr ""
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
-msgstr "憑證應該還未被用於 CRL 簽署\n"
+msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
msgid "quiet"
-msgstr "安靜模式"
+msgstr ""
+#: tools/gpg-connect-agent.c:79
msgid "print data out hex encoded"
-msgstr "列印資料超出十六進制編碼範圍"
+msgstr ""
+#: tools/gpg-connect-agent.c:80
msgid "decode received data lines"
-msgstr "對已收到的資料列解碼"
+msgstr ""
+#: tools/gpg-connect-agent.c:81
msgid "connect to the dirmngr"
-msgstr "連線至 dirmngr"
+msgstr ""
+#: tools/gpg-connect-agent.c:84
msgid "|NAME|connect to Assuan socket NAME"
-msgstr "|名稱|連線至指定名稱的 Assuan socket"
+msgstr ""
+#: tools/gpg-connect-agent.c:86
msgid "|ADDR|connect to Assuan server at ADDR"
-msgstr "|ADDR|連線至位於 ADDR 的 Assuan 伺服器"
+msgstr ""
+#: tools/gpg-connect-agent.c:88
msgid "run the Assuan server given on the command line"
-msgstr "執行命令列所給定的 Assuan 伺服器"
+msgstr ""
+#: tools/gpg-connect-agent.c:90
msgid "do not use extended connect mode"
-msgstr "不要使用延伸連線模式"
+msgstr ""
+#: tools/gpg-connect-agent.c:92
msgid "|FILE|run commands from FILE on startup"
-msgstr "|檔案|啟動時執行指定檔案中的指令"
+msgstr ""
+#: tools/gpg-connect-agent.c:93
msgid "run /subst on startup"
-msgstr "啟動時執行 /subst"
+msgstr ""
+#: tools/gpg-connect-agent.c:205
msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
-msgstr "用法: @GPG at -connect-agent [選項] (或用 -h 求助)"
+msgstr ""
+#: tools/gpg-connect-agent.c:208
msgid ""
"Syntax: @GPG at -connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-"語法: @GPG at -connect-agent [選項]\n"
-"連線至運作中的代理程式並送出指令\n"
+#: tools/gpg-connect-agent.c:1247
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
-msgstr "\"%s\" 選項需要有程式及選用的引數\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1258 tools/gpg-connect-agent.c:1264
+#: tools/gpg-connect-agent.c:1270
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
-msgstr "\"%s\" 選項因為 \"%s\" 而被忽略了\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
#, c-format
msgid "receiving line failed: %s\n"
-msgstr "接收列時失敗: %s\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1458
msgid "line too long - skipped\n"
-msgstr "列太長 - 已跳過\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1462
msgid "line shortened due to embedded Nul character\n"
-msgstr "列因嵌入的 Nul 字符而縮短了\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1837
#, c-format
msgid "unknown command '%s'\n"
-msgstr "未知的指令 '%s'\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1855
#, c-format
msgid "sending line failed: %s\n"
-msgstr "送出列時失敗: %s\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:2251
#, c-format
msgid "error sending standard options: %s\n"
-msgstr "送出標準選項時出錯: %s\n"
+msgstr ""
+#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
+#: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
msgid "Options controlling the diagnostic output"
-msgstr "控制著診斷性輸出的選項"
+msgstr ""
+#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
+#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
msgid "Options controlling the configuration"
-msgstr "控制著組態的選項"
+msgstr ""
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
+#: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
msgid "Options useful for debugging"
-msgstr "對除錯有幫助的選項"
+msgstr ""
+#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
msgid "Options controlling the security"
-msgstr "控制著安全性的選項"
+msgstr ""
+#: tools/gpgconf-comp.c:528
msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|在 N 秒之後讓 SSH 金鑰過期"
+msgstr ""
+#: tools/gpgconf-comp.c:532
msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr "|N|把個人識別碼 (PIN) 快取最大生存時間設成 N 秒"
+msgstr ""
+#: tools/gpgconf-comp.c:536
msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|把 SSH 金鑰最大生存時間設成 N 秒"
+msgstr ""
+#: tools/gpgconf-comp.c:560
msgid "Options enforcing a passphrase policy"
-msgstr "強制執行密語原則的選項"
+msgstr ""
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
-msgstr "不允許略過密語原則"
+msgstr ""
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|把新密語所需的最短長度設成 N"
+msgstr ""
+#: tools/gpgconf-comp.c:571
msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr "|N|新密語至少要有 N 個非字母的字符"
+msgstr ""
+#: tools/gpgconf-comp.c:575
msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|檔案|用指定檔案中的樣式來檢查新密語"
+msgstr ""
+#: tools/gpgconf-comp.c:579
msgid "|N|expire the passphrase after N days"
-msgstr "|N|在 N 天之後讓密語過期"
+msgstr ""
+#: tools/gpgconf-comp.c:583
msgid "do not allow the reuse of old passphrases"
-msgstr "不允許重複使用舊密語"
+msgstr ""
-#, fuzzy
-#| msgid "|N|set LDAP timeout to N seconds"
+#: tools/gpgconf-comp.c:587
msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|把 LDAP 逾時設成 N 秒"
+msgstr ""
+#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
msgid "|NAME|use NAME as default secret key"
-msgstr "|名字|使用指定名字做為預設私鑰"
+msgstr ""
+#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|名字|也加密給指定名字的使用者 ID"
+msgstr ""
+#: tools/gpgconf-comp.c:704
msgid "|SPEC|set up email aliases"
-msgstr "|SPEC|設定電子郵件別名"
+msgstr ""
+#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
msgid "Configuration for Keyservers"
-msgstr "金鑰伺服器組態"
+msgstr ""
+#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
msgid "|URL|use keyserver at URL"
-msgstr "|URL|使用位於 URL 的金鑰伺服器"
+msgstr ""
+#: tools/gpgconf-comp.c:735
msgid "allow PKA lookups (DNS requests)"
-msgstr "允許 PKA 查找 (DNS 請求)"
+msgstr ""
+#: tools/gpgconf-comp.c:738
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr "|MECHANISMS|使用 MECHANISMS 機制來從郵件地址找出金鑰"
+msgstr ""
+#: tools/gpgconf-comp.c:787
msgid "disable all access to the dirmngr"
-msgstr "停用所有的 dirmngr 存取"
+msgstr ""
+#: tools/gpgconf-comp.c:790
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|名稱|將指定名稱的編碼用於 PKCS#12 密語"
+msgstr ""
+#: tools/gpgconf-comp.c:820
msgid "do not check CRLs for root certificates"
-msgstr "不要為根憑證檢查 CRL"
+msgstr ""
+#: tools/gpgconf-comp.c:869
msgid "Options controlling the format of the output"
-msgstr "控制著輸出格式的選項"
+msgstr ""
+#: tools/gpgconf-comp.c:905
msgid "Options controlling the interactivity and enforcement"
-msgstr "控制著互動及強制執行的選項"
+msgstr ""
-#, fuzzy
-#| msgid "Options controlling the security"
+#: tools/gpgconf-comp.c:915
msgid "Options controlling the use of Tor"
-msgstr "控制著安全性的選項"
+msgstr ""
+#: tools/gpgconf-comp.c:929
msgid "Configuration for HTTP servers"
-msgstr "HTTP 伺服器組態"
+msgstr ""
+#: tools/gpgconf-comp.c:940
msgid "use system's HTTP proxy setting"
-msgstr "使用系統的 HTTP 代理伺服器設定"
+msgstr ""
+#: tools/gpgconf-comp.c:945
msgid "Configuration of LDAP servers to use"
-msgstr "要用的 LDAP 伺服器組態"
+msgstr ""
+#: tools/gpgconf-comp.c:974
msgid "LDAP server list"
-msgstr "LDAP 伺服器清單"
+msgstr ""
+#: tools/gpgconf-comp.c:982
msgid "Configuration for OCSP"
-msgstr "OCSP 組態"
+msgstr ""
+#: tools/gpgconf-comp.c:1063
msgid "GPG for OpenPGP"
-msgstr "OpenPGP 版 GPG"
+msgstr ""
+#: tools/gpgconf-comp.c:1064
msgid "GPG Agent"
-msgstr "GPG Agent"
+msgstr ""
+#: tools/gpgconf-comp.c:1065
msgid "Smartcard Daemon"
-msgstr "智慧卡服務"
+msgstr ""
+#: tools/gpgconf-comp.c:1066
msgid "GPG for S/MIME"
-msgstr "S/MIME 版 GPG"
+msgstr ""
+#: tools/gpgconf-comp.c:1067
msgid "Key Acquirer"
msgstr ""
+#: tools/gpgconf-comp.c:1068
msgid "PIN and Passphrase Entry"
-msgstr "個人識別碼及密語項目"
+msgstr ""
+#: tools/gpgconf-comp.c:1182
msgid "Component not suitable for launching"
-msgstr "元件不適合啟動"
+msgstr ""
+#: tools/gpgconf-comp.c:3240
#, c-format
msgid "External verification of component %s failed"
-msgstr "元件 %s 的外部驗證失敗"
+msgstr ""
+#: tools/gpgconf-comp.c:3391
msgid "Note that group specifications are ignored\n"
-msgstr "請注意群組規格已忽略\n"
+msgstr ""
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
-msgstr "列出所有的元件"
+msgstr ""
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
-msgstr "檢查所有的程式"
+msgstr ""
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
-msgstr "|元件|列出選項"
+msgstr ""
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
-msgstr "|元件|變更選項"
+msgstr ""
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
-msgstr "|元件|檢查選項"
+msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
-msgstr "套用全域預設值"
+msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
-msgstr "取得 @GPGCONF@ 的組態目錄"
+msgstr ""
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
msgid "list global configuration file"
-msgstr "列出全域組態檔"
+msgstr ""
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
msgid "check global configuration file"
-msgstr "檢查全域組態檔案"
+msgstr ""
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
-msgstr "重新載入所有或給定的元件"
+msgstr ""
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
-msgstr "啟動給定的元件"
+msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
-msgstr "刪除給定的元件"
+msgstr ""
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
-msgstr "當作輸出檔案來使用"
+msgstr ""
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
-msgstr "如果可能的話, 在執行期啟用變更"
+msgstr ""
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
msgid "Usage: @GPGCONF@ [options] (-h for help)"
-msgstr "用法: @GPGCONF@ [選項] (或用 -h 求助)"
+msgstr ""
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
-"語法: @GPGCONF@ [選項]\n"
-"管理 @GNUPG@ 系統工具的組態選項\n"
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
-msgstr "需要一個元件引數"
+msgstr ""
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
msgid "Component not found"
-msgstr "找不到元件"
+msgstr ""
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
msgid "No argument allowed"
-msgstr "未允許使用引數"
+msgstr ""
+#: tools/symcryptrun.c:154
msgid ""
"@\n"
"Commands:\n"
@@@ -10167,132 -8184,108 +10099,132 @@@ msgid "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-"語法: symcryptrun --class 型別 --program 程式 --keyfile 金鑰檔案 [選項...] 指"
-"令 [輸入檔案]\n"
-"叫用單純對稱式加密工具\n"
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, c-format
msgid "%s on %s aborted with status %i\n"
-msgstr "%s 於 %s 以 %i 狀態中止了\n"
+msgstr ""
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, c-format
msgid "%s on %s failed with status %i\n"
-msgstr "%s 於 %s 以 %i 狀態失敗了\n"
+msgstr ""
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, c-format
msgid "can't create temporary directory '%s': %s\n"
-msgstr "無法建立暫存目錄 '%s': %s\n"
+msgstr ""
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, c-format
msgid "could not open %s for writing: %s\n"
-msgstr "無法開啟 %s 來寫入: %s\n"
+msgstr ""
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, c-format
msgid "error writing to %s: %s\n"
-msgstr "寫入 %s 時出錯: %s\n"
+msgstr ""
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, c-format
msgid "error reading from %s: %s\n"
-msgstr "讀取 %s 時出錯: %s\n"
+msgstr ""
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, c-format
msgid "error closing %s: %s\n"
-msgstr "關閉 %s 時出錯: %s\n"
+msgstr ""
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
msgid "no --program option provided\n"
-msgstr "沒有提供 --program 選項\n"
+msgstr ""
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
-msgstr "祇支援 --decrypt 和 --encrypt\n"
+msgstr ""
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
-msgstr "沒有提供 --keyfile 選項\n"
+msgstr ""
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
-msgstr "無法配置引數向量\n"
+msgstr ""
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, c-format
msgid "could not create pipe: %s\n"
-msgstr "無法建立管道: %s\n"
+msgstr ""
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, c-format
msgid "could not create pty: %s\n"
-msgstr "無法建立 pty: %s\n"
+msgstr ""
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
-msgstr "無法衍生: %s\n"
+msgstr ""
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, c-format
msgid "execv failed: %s\n"
-msgstr "execv 失敗: %s\n"
+msgstr ""
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, c-format
msgid "select failed: %s\n"
-msgstr "挑選失敗: %s\n"
+msgstr ""
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, c-format
msgid "read failed: %s\n"
-msgstr "讀取失敗: %s\n"
+msgstr ""
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, c-format
msgid "pty read failed: %s\n"
-msgstr "pty 讀取失敗: %s\n"
+msgstr ""
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, c-format
msgid "waitpid failed: %s\n"
-msgstr "waitpid 失敗: %s\n"
+msgstr ""
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
-msgstr "子代以 %i 狀態中止了\n"
+msgstr ""
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, c-format
msgid "cannot allocate infile string: %s\n"
-msgstr "無法配置檔內字串: %s\n"
+msgstr ""
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, c-format
msgid "cannot allocate outfile string: %s\n"
-msgstr "無法配置檔外字串: %s\n"
+msgstr ""
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
-msgstr "一定要給定 %s 或 %s 其中之一\n"
+msgstr ""
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
-msgstr "沒有提供類別\n"
+msgstr ""
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, c-format
msgid "class %s is not supported\n"
-msgstr "未支援 %s 類別\n"
+msgstr ""
+#: tools/gpg-check-pattern.c:144
msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "用法: gpg-check-pattern [選項] 樣式檔案 (或用 -h 求助)\n"
+msgstr ""
+#: tools/gpg-check-pattern.c:147
msgid ""
"Syntax: gpg-check-pattern [options] patternfile\n"
"Check a passphrase given on stdin against the patternfile\n"
diff --cc po/hu.po
index a7db457,e9ef4f2..69b7d89
--- a/po/hu.po
+++ b/po/hu.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2004-06-19 21:53+0200\n"
"Last-Translator: Nagy Ferenc L�szl� <nfl at nfllab.com>\n"
"Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
@@@ -98,14 -82,10 +98,14 @@@ msgstr "K�rem, adja meg a jelsz�t! Ezt
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
#, fuzzy
msgid "Passphrase:"
msgstr "rossz jelsz�"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr ""
@@@ -150,98 -122,70 +150,98 @@@ msgstr "hib�s MPI
msgid "Bad Passphrase"
msgstr "rossz jelsz�"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, 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:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, fuzzy, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, fuzzy, c-format
msgid "shadowing the key failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, fuzzy, c-format
msgid "error writing key: %s\n"
msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "jelsz�v�ltoztat�s"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
"%s%%0Awithin gpg-agent's key storage"
msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
@@@ -382,8 -300,6 +382,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "jelsz�v�ltoztat�s"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -393,118 -309,87 +393,118 @@@ msgstr "
"Opci�k:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "b�besz�d� m�d"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "m�g sz�kszav�bb m�d"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|f�jl|b�v�t� modul bet�lt�se"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "kulcsok keres�se kulcsszerveren"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "bizalmi adatb�zis friss�t�se"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, 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:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
#, fuzzy
msgid "allow presetting passphrase"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "nem t�mogatott"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -513,134 -398,92 +513,126 @@@ 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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "A hib�kat (angolul) a <gnupg-bugs at gnu.org> c�mre �rja meg!\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
#, 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:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr ""
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "\"%s\" opci�s f�jl: %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, 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:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s nem hozhat� l�tre: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
#, 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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, 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:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, 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:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, 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:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: K�nyvt�rat l�trehoztam.\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, 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:1958
++#: agent/gpg-agent.c:1957
#, 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:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@@ -655,28 -496,22 +647,28 @@@ msgstr "
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2390
++#: agent/gpg-agent.c:2392
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: kihagyva: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
@@@ -692,8 -525,6 +684,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -701,9 -532,6 +693,9 @@@ msgstr "
"@Parancsok:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -724,40 -550,33 +716,40 @@@ msgid "
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
#, fuzzy
msgid "cancelled\n"
msgstr "M�gsem"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, fuzzy, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@@ -927,42 -717,30 +919,42 @@@ msgstr "%d%s v�d� algoritmus nem t�moga
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@@ -977,37 -753,15 +969,18 @@@ msgstr "Hiba a(z) \"%s\" titkoskulcs-ka
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "Kommunik�ci�s probl�ma a gpg �gyn�kkel!\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
#, fuzzy
msgid "problem setting the gpg-agent options\n"
msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- #, fuzzy
- msgid "canceled by user\n"
- msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
-
- #: common/simple-pwquery.c:579
- #, fuzzy
- msgid "problem with the agent\n"
- msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "Nem tudom letiltani a core f�jlokat: %s.\n"
@@@ -1093,7 -830,6 +1066,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1117,17 -849,14 +1090,17 @@@ msgstr "
msgid "connection to agent is in restricted mode\n"
msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr ""
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1421,7 -1090,6 +1394,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
#, fuzzy
msgid "out of core\n"
msgstr "nem feldolgozott"
@@@ -1480,7 -1137,10 +1453,13 @@@ msgstr "A(z) %08lX nyilv�nos kulcsot ne
msgid "waiting for lock %s...\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr ""
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "P�nc�l: %s\n"
@@@ -1730,10 -1335,6 +1709,10 @@@ msgstr "Nincs hozz� tartoz� nyilv�nos k
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
@@@ -2032,27 -1568,18 +2011,27 @@@ msgstr "�rom a titkos kulcsot a %s �llo
msgid "Invalid command (try \"help\")\n"
msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "Nem tudom megnyitni %s-t!\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, 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:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
@@@ -2114,62 -1629,51 +2093,62 @@@ msgstr "Van egy titkos kulcs a \"%s\" n
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "El�sz�r azt t�r�lje a \"--delete-secret-keys\" opci�val!\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "Nem tudok szimmetrikus ESK csomagot haszn�lni a S2K m�d miatt!\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "%s rejtjelez�st haszn�lok.\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "\"%s\" m�r t�m�r�tett.\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "FIGYELEM: A(z) \"%s\" �llom�ny �res.\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "Olvasok a \"%s\" �llom�nyb�l.\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "A %s (%d) t�m�r�t�s haszn�lata s�rti a c�mzett preferenci�it!\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
@@@ -2283,8 -1766,6 +2262,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: kihagyva: %s\n"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2321,8 -1795,6 +2300,8 @@@ msgstr "Hiba \"%s\" l�trehoz�sakor: %s\
msgid "[User ID not found]"
msgstr "[ismeretlen kulcs]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "�rv�nytelen import opci�k!\n"
@@@ -2393,218 -1852,169 +2372,218 @@@ msgstr "
msgid "using subkey %s instead of primary key %s\n"
msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "k�l�n�ll� al��r�s k�sz�t�se"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
#, fuzzy
msgid "make a clear text signature"
msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "k�l�n�ll� al��r�s k�sz�t�se"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "adat titkos�t�sa"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "adat visszafejt�se (alap�rtelmez�s)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "al��r�s ellen�rz�se"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "kulcsok list�z�sa"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "kulcsok �s al��r�sok list�z�sa"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "list and check key signatures"
msgstr "kulcsal��r�sok ellen�rz�se"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "kulcsok �s ujjlenyomatok list�z�sa"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "titkos kulcsok list�z�sa"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "�j kulcsp�r l�trehoz�sa"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "�j kulcsp�r l�trehoz�sa"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "�j kulcsp�r l�trehoz�sa"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "�j kulcsp�r l�trehoz�sa"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "visszavon�si igazol�s k�sz�t�se"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "kulcs al��r�sa"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "kulcs al��r�sa helyileg"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "kulcs al��r�sa"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "kulcs al��r�sa helyileg"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "kulcs al��r�sa vagy szerkeszt�se"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "jelsz�v�ltoztat�s"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "kulcsok export�l�sa"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "kulcsok export�l�sa kulcsszerverre"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "kulcsok import�l�sa kulcsszerverr�l"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "kulcsok keres�se kulcsszerveren"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "minden kulcs friss�t�se kulcsszerverr�l"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "kulcsok import�l�sa/�sszef�z�se"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "bizalmi adatb�zis friss�t�se"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
#, fuzzy
msgid "print message digests"
msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|N�V|titkos�t�s N�V r�sz�re"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|t�m�r�t�si szint be�ll�t�sa N-re (0: tilt�s)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "kanonikus sz�veges m�d haszn�lata"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|f�jl|b�v�t� modul bet�lt�se"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "ne csin�ljon semmi v�ltoztat�st"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "fel�l�r�s el�tt r�k�rdez�s"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2612,7 -2022,6 +2591,7 @@@ msgstr "
"@\n"
"(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2632,13 -2041,11 +2611,13 @@@ msgstr "
" --list-keys [nevek] kulcsok ki�rat�sa\n"
" --fingerprint [nevek] ujjlenyomatok ki�rat�sa\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2653,7 -2060,6 +2632,7 @@@ msgstr "
"Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
"Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2661,607 -2067,473 +2640,602 @@@ msgstr "
"\n"
"T�mogatott algoritmusok:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "Nyilv�nos kulcs� (pubkey): "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Rejtjelez� (cipher): "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Kivonatol� (hash): "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "T�m�r�t� (compression): "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "Haszn�lat: gpg [opci�k] "
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "Egym�snak ellentmond� parancsok!\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "kulcs tilt�sa"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, fuzzy, c-format
#| msgid "NOTE: old default options file `%s' ignored\n"
msgid "Note: old default options file '%s' ignored\n"
msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr ""
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "Ez nem �rv�nyes e-mail c�m.\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: �rv�nytelen import opci�k!\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "�rv�nytelen import opci�k!\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "�rv�nytelen import opci�k!\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: �rv�nytelen import opci�k!\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
#, fuzzy
msgid "invalid list options\n"
msgstr "�rv�nytelen import opci�k!\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
#, fuzzy
msgid "invalid verify options\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "Nem tudom a v�grehajt�si el�r�si utat %s �rt�kre �ll�tani!\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s �rtelmetlen %s mellett!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth 1 �s 255 k�z� kell essen!\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "�rv�nytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "�rv�nytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, fuzzy, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr ""
"Lehet, hogy nem haszn�lhatja \"%s\" rejtjelez� algoritmust %s m�dban!\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, fuzzy, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr ""
"Lehet, hogy nem haszn�lhatja \"%s\" kivonatol� algoritmust %s m�dban!\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, fuzzy, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "Lehet, hogy nem haszn�lhatja \"%s\" t�m�r�t� algoritmust %s m�dban!\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"FIGYELEM: C�mzett megadva (-r), de nincs nyilv�nos kulcs� titkos�t�s!\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [f�jln�v]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [f�jln�v]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "Visszafejt�s sikertelen: %s.\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [f�jln�v]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [f�jln�v]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [f�jln�v]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [f�jln�v]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [f�jln�v]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key felh-azonos�t�"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key felh-azonos�t�"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key felh-azonos�t� [parancsok]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key felh-azonos�t�"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "Kulcsexport�l�s sikertelen: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "Kulcsexport�l�s sikertelen: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[f�jln�v]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Kezdheti g�pelni az �zenetet...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
@@@ -3306,328 -2570,262 +3280,328 @@@ msgstr "Nem �ll rendelkez�sre seg�ts�g.
msgid "No help available for '%s'"
msgstr "Nem �ll rendelkez�sre seg�ts�g \"%s\" t�m�hoz."
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "bizalmi adatb�zis friss�t�se"
- #: g10/import.c:143
++#: g10/import.c:147
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "bizalmi adatb�zis friss�t�se"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
msgid "show key during import"
msgstr "megmutatja az ujjlenyomatot"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:152
++#: g10/import.c:156
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "haszn�lhatatlan titkos kulcs"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "%d t�pus� blokkot kihagyom.\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr " �sszesen feldolgoztam: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " �j kulcsok kihagyva: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " �j kulcsok kihagyva: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " felh. azonos�t� n�lk�l: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " import�lva: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " v�ltozatlan: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " �j felh. azonos�t�k: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " �j alkulcsok: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " �j al��r�sok: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " �j kulcsvisszavon�sok: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " olvasott titkos kulcsok: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " import�lt titkos kulcsok: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "v�ltozatlan titkos kulcsok: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " nem import�lt: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " �j al��r�sok: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " olvasott titkos kulcsok: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1042
++#: g10/import.c:1048
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "Kihagytam \"%s\"-t: %s.\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1264
++#: g10/import.c:1343
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "%08lX kulcs: HKP alkulcss�r�l�s kijav�tva.\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "%08lX kulcs: Nem �nal��rt felh. azonos�t� (\"%s\") elfogadva.\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "%08lX kulcs: Nincs �rv�nyes felhaszn�l�i azonos�t�.\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "%08lX kulcs: Nyilv�nos kulcs nem tal�lhat�: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "%08lX kulcs: Nem egyezik a mi m�solatunkkal!\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "%08lX kulcs: Nem tal�lom az eredeti kulcsblokkot: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "%08lX kulcs: \"%s\" 1 �j felhaszn�l�i azonos�t�.\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
@@@ -3643,143 -2841,116 +3617,143 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "%08lX kulcs: Nincs nyilv�nos kulcs - nem tudok visszavonni.\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - visszautas�tva.\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t� ehhez az al��r�shoz!\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� alg. a \"%s\" felh. "
"azonos�t�n!\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "%08lX kulcs: �rv�nytelen �nal��r�s a \"%s\" felh. azonos�t�n!\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� algoritmus!\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "%08lX kulcs: Nincs alkulcs a kulcsk�t�shez!\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsk�t�st.\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsvisszavon�st.\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "%08lX kulcs: Nem export�lhat� al��r�s (%02x. oszt�ly) - kihagytam.\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "%08lX kulcs: Visszavon� igazol�s rossz helyen - kihagytam.\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - kihagytam.\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "%08lX kulcs: V�ratlan al��r�soszt�ly (0x%02X) - kihagytam.\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "%08lX kulcs: Dupl�zott felh. azonos�t�t tal�ltam - �sszef�ztem.\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
"leh�vom a %08lX visszavon� kulcsot.\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
"visszavon� kulcs (%08lX) nincs jelen.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
@@@ -4136,8 -3245,6 +4110,8 @@@ msgstr "
msgid "Really sign? (y/N) "
msgstr "Val�ban al��rja? "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "Al��r�s sikertelen: %s\n"
@@@ -4621,14 -3626,10 +4595,14 @@@ msgstr "
"K�rem, vegye figyelembe, hogy az itt l�that� kulcs �rv�nyess�ge nem\n"
"felt�tlen�l helyes, am�g �jra nem ind�tja a programot!\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
#, fuzzy
msgid "revoked"
msgstr "[visszavont] "
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5590,26 -4413,22 +5564,26 @@@ msgstr " Kulcs ujjlenyomata =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "Ellen�rz�m a(z) \"%s\" kulcskarik�t.\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
msgstr[1] "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5617,7 -4436,6 +5591,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 rossz al��r�s.\n"
msgstr[1] "1 rossz al��r�s.\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: Kulcskarik�t l�trehoztam.\n"
@@@ -5842,117 -4615,97 +5816,122 @@@ msgstr "
msgid "no signature found\n"
msgstr "J� al��r�s a k�vetkez�t�l: \""
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "ROSSZ al��r�s a k�vetkez�t�l: \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Lej�rt al��r�s a k�vetkez�t�l: \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "J� al��r�s a k�vetkez�t�l: \""
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "Nem tudom kezelni ezeket a t�bbsz�r�s al��r�sokat!\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Az al��r�s lej�rt: %s.\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " azaz \""
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Al��rva: %.*s; kulcs: %s, %08lX.\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ msgid " issuer \"%s\"\n"
+ msgstr " azaz \""
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "Kulcs tal�lhat�: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[bizonytalan]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " azaz \""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "Az al��r�s lej�rt: %s.\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "Az al��r�s lej�r: %s.\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "Bin�ris"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "Sz�vegm�d�"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "Ismeretlen m�d�"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "ismeretlen nyilv�nos kulcs� algoritmus"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "Nem k�l�n�ll� al��r�s.\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "FIGYELEM: T�bbsz�r�s al��r�st �rz�keltem. Csak az els�t ellen�rz�m.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "0x%02x oszt�ly� k�l�n�ll� al��r�s.\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
@@@ -6138,92 -4856,46 +6117,57 @@@ msgstr "
msgid "subpacket of type %d has critical bit set\n"
msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, fuzzy, c-format
- msgid " (main key ID %s)"
- msgstr ""
- " \n"
- " (f� kulcsazonos�t�: %08lX)"
-
- #: g10/passphrase.c:277
- #, fuzzy, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Most meg kell adnia a jelsz�t, mellyel a k�vetkez� felhaszn�l�\n"
- "titkos kulcsa haszn�latba vehet�:\n"
- "\"%.*s\"\n"
- "%u bites %s key, azonos�t�: %08lX, l�trehozva: %s%s\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "�rja be a jelsz�t!\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
- #: g10/passphrase.c:483
- #, fuzzy, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "\n"
- "Jelsz�ra van sz�ks�ge a k�vetkez� felhaszn�l� titkos kulcs�nak "
- "haszn�lat�hoz:\n"
- "\""
-
- #: g10/passphrase.c:491
++#: g10/passphrase.c:489
#, fuzzy, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%u bites %s kulcs, azonos�t�: %08lX, l�trehozva: %s."
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
+ msgid " (main key ID %s)"
msgstr ""
+ " \n"
+ " (f� kulcsazonos�t�: %08lX)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6427,126 -5064,99 +6371,126 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "M�gis haszn�ljuk ezt a kulcsot? "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "FIGYELEM: Nem b�zunk a kulcsban, amit haszn�lunk!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "FIGYELEM: a kulcsot visszavonhatt�k (visszavon� kulcs nincs jelen).\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "FIGYELEM: Ezt a kulcsot a tulajdonosa visszavonta!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Ez jelentheti azt, hogy az al��r�s hamis.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "FIGYELEM: Ezt az alkulcsot a tulajdonosa visszavonta!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Megjegyz�s: Ez a kulcs le lett tiltva.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Megjegyz�s: Ez a kulcs lej�rt!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "FIGYELEM: Ez a kulcs nincs hiteles�tve megb�zhat� al��r�ssal!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "FIGYELEM: NEM b�zunk ebben a kulcsban!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " Az al��r�s val�sz�n�leg HAMIS.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"FIGYELEM: Ez a kulcs nincs igazolva kell�k�ppen megb�zhat� al��r�ssal!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
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:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: kihagyva: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: Kihagyva: Nyilv�nos kulcs nincs enged�lyezve.\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: kihagyva: nyilv�nos kulcs m�r szerepel\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
- #: g10/pkclist.c:991
++#: g10/pkclist.c:995
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
- #: g10/pkclist.c:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6554,38 -5164,30 +6498,38 @@@ msgstr "
"\n"
"Adja meg a felhaszn�l�i azonos�t�t! �res sorral fejezze be: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Nincs ilyen felhaszn�l�i azonos�t�.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
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:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "Nyilv�nos kulcs nincs enged�lyezve.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva.\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "Nincsenek �rv�nyes c�mzettek!\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, 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:1649
++#: g10/pkclist.c:1653
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
@@@ -6865,7 -5415,6 +6809,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
msgstr[1] "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6939,12 -5479,10 +6883,12 @@@ msgstr "
"hossz�).\n"
"Kifejt�s n�lk�l haszn�lom.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s al��r�s a k�vetkez�t�l: \"%s\"\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6952,11 -5490,9 +6896,11 @@@ msgstr "
"%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
"a c�mzett preferenci�ival.\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "Al��rom:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s titkos�t�st fogok haszn�lni.\n"
@@@ -7065,7 -5581,6 +7009,7 @@@ msgstr "Bizalmi adatb�zis tranzakci�ja
msgid "%s: directory does not exist!\n"
msgstr "%s: K�nyvt�r nem l�tezik!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
@@@ -7177,150 -5670,117 +7121,142 @@@ msgstr "Nem tudok %d karaktern�l hossza
msgid "input line longer than %d characters\n"
msgstr "A bemeneti sor hosszabb, mint %d karakter.\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"T�mogatott algoritmusok:\n"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: Hiba k�nyvt�rrekord �r�sakor: %s.\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Elj�r�sm�d: "
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "kulcsok list�z�sa"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
msgstr[1] "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7330,93 -5790,78 +7266,93 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
msgid "Verified %ld messages signed by \"%s\"."
msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7427,20 -5872,16 +7363,20 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7457,8 -5898,6 +7393,7 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
@@@ -7998,7 -6328,6 +7933,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8054,16 -6372,13 +7989,16 @@@ msgid "
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8168,12 -6460,10 +8103,12 @@@ msgstr "
msgid "checking the CRL failed: %s"
msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr ""
@@@ -8186,7 -6474,6 +8121,7 @@@ msgstr "�rom a titkos kulcsot a %s �llo
msgid "intermediate certificate not yet valid"
msgstr ""
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
#, fuzzy
msgid "certificate has expired"
msgstr "Ez a kulcs lej�rt!"
@@@ -8242,7 -6518,6 +8177,7 @@@ msgstr "rossz igazol�s
msgid " ( issuer valid from "
msgstr ""
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "megmutatja az ujjlenyomatot"
@@@ -8272,7 -6541,6 +8207,7 @@@ msgstr "visszavon�si igazol�s k�sz�t�se
msgid "self-signed certificate has a BAD signature"
msgstr ""
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr ""
@@@ -8281,29 -6548,23 +8216,29 @@@
msgid "checking the trust list failed: %s\n"
msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr ""
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr ""
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "al��r�s ellen�rz�se"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr ""
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
#, fuzzy
msgid "certificate is good\n"
msgstr "%c%lu preferencia k�tszer szerepel!\n"
@@@ -8336,7 -6591,6 +8271,7 @@@ msgstr "
msgid "(this is the MD2 algorithm)\n"
msgstr ""
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
#, fuzzy
msgid "none"
msgstr "nem"
@@@ -8373,36 -6622,28 +8308,36 @@@ msgstr "
"\"%.*s\"\n"
"%u bites %s key, azonos�t�: %08lX, l�trehozva: %s%s\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr ""
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr ""
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr ""
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr ""
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr ""
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr ""
@@@ -8842,22 -6993,18 +8777,22 @@@ msgstr "
msgid "%s:%u: skipping this line\n"
msgstr " h = kulcs kihagy�sa\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "�rok a \"%s\" �llom�nyba.\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, 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:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8920,7 -7055,6 +8855,7 @@@ msgstr "rev? Nem tudom ellen�rizni a vi
msgid "error storing flags: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr ""
@@@ -9039,98 -7152,73 +8974,92 @@@ msgstr "
msgid "dropping %u certificates from the cache\n"
msgstr ""
- #: dirmngr/certcache.c:352
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
- msgid "can't access directory '%s': %s\n"
- msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't parse certificate '%s': %s\n"
msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, fuzzy, c-format
msgid "certificate '%s' already cached\n"
msgstr "%c%lu preferencia k�tszer szerepel!\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, fuzzy, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "Visszavon� igazol�s l�trehozva.\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, fuzzy, c-format
msgid "certificate '%s' loaded\n"
msgstr "%c%lu preferencia k�tszer szerepel!\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, fuzzy, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr "megmutatja az ujjlenyomatot"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, fuzzy, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, fuzzy, c-format
msgid "permanently loaded certificates: %u\n"
msgstr "rossz igazol�s"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, fuzzy, c-format
msgid " runtime cached certificates: %u\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
#, fuzzy
msgid "certificate already cached\n"
msgstr "Visszavon� igazol�s l�trehozva.\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
#, fuzzy
msgid "certificate cached\n"
msgstr "%c%lu preferencia k�tszer szerepel!\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, fuzzy, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, fuzzy, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, fuzzy, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
#, fuzzy
msgid "no issuer found in certificate\n"
msgstr "visszavon�si igazol�s k�sz�t�se"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, fuzzy, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@@ -9391,7 -7428,6 +9320,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
@@@ -9413,7 -7446,6 +9342,7 @@@ msgstr "�rv�nytelen v�lasz az �gyn�kt�l
msgid "converting S-expression failed: %s\n"
msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
@@@ -9809,116 -7761,85 +9738,112 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr ""
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|f�jl|b�v�t� modul bet�lt�se"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
#, fuzzy
msgid "run without asking a user"
msgstr "Kil�pjek ment�s n�lk�l? "
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|f�jl|b�v�t� modul bet�lt�se"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9931,91 -7852,72 +9856,91 @@@ msgstr "
"@\n"
"(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "Haszn�lat: gpg [opci�k] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
#, 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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "A sor t�l hossz�!\n"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "Olvas�si hiba: %s.\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
#, fuzzy
msgid "shutdown forced\n"
msgstr "nem feldolgozott"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10359,103 -8191,82 +10284,103 @@@ msgstr "A l�trehozott al��r�s ellen�rz�
msgid "not signed by a default OCSP signer's certificate"
msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, fuzzy, c-format
msgid "allocating list item failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, fuzzy, c-format
msgid "error getting responder ID: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr ""
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, fuzzy, c-format
msgid "issuer certificate not found: %s\n"
msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr ""
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
#, fuzzy
msgid "caller did not return the issuing certificate\n"
msgstr "visszavon�si igazol�s k�sz�t�se"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, fuzzy, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, fuzzy, c-format
#| msgid "%s: can't access: %s\n"
msgid "can't get authorityInfoAccess: %s\n"
msgstr "%s: Nem tudom el�rni: %s.\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
#, fuzzy
#| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr ""
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, fuzzy, c-format
#| msgid "using cipher %s\n"
msgid "using OCSP responder '%s'\n"
msgstr "%s rejtjelez�st haszn�lok.\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, fuzzy, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, fuzzy, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr ""
@@@ -10503,33 -8304,27 +10428,33 @@@ msgstr "A kulcsblokk t�rl�se sikertelen
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, 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:2415
++#: dirmngr/server.c:2377
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, 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:2444
++#: dirmngr/server.c:2406
#, 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:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10554,34 -8345,24 +10479,30 @@@ msgstr "
msgid "checking CRL for"
msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
#, fuzzy
msgid "selfsigned certificate has a BAD signature"
msgstr "al��r�s ellen�rz�se"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, fuzzy, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
#, fuzzy
msgid "certificate chain is good\n"
msgstr "%c%lu preferencia k�tszer szerepel!\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "A DSA 160 bites hash (kivonatol�) algoritmust ig�nyel.\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "kil�p�s|kilepes"
@@@ -10709,11 -8459,9 +10630,11 @@@ msgstr "
msgid "Options enforcing a passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
@@@ -10853,85 -8569,66 +10774,85 @@@ msgstr "
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
#, fuzzy
msgid "list global configuration file"
msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
#, fuzzy
msgid "check global configuration file"
msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "kimeneti �llom�ny megad�sa"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
#, fuzzy
msgid "Component not found"
msgstr "nyilv�nos kulcs nem tal�lhat�"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
#, fuzzy
msgid "No argument allowed"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
@@@ -10985,123 -8673,98 +10906,123 @@@ msgid "
"Call a simple symmetric encryption tool\n"
msgstr ""
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, fuzzy, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "Nem tudom megnyitni %s-t: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
#, fuzzy
msgid "no --program option provided\n"
msgstr "K�ls� program megh�v�sa nem t�mogatott.\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr ""
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr ""
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "%s nem hozhat� l�tre: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "%s nem hozhat� l�tre: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr ""
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr ""
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
diff --cc po/id.po
index 903a10d,015e419..7104986
--- a/po/id.po
+++ b/po/id.po
@@@ -10,7 -10,6 +10,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg-id\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2004-06-17 16:32+0700\n"
"Last-Translator: Tedi Heriyanto <tedi_h at gmx.net>\n"
"Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
@@@ -103,14 -87,10 +103,14 @@@ msgstr "Silakan masukkan passphrase; in
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
#, fuzzy
msgid "Passphrase:"
msgstr "passphrase yang buruk"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr ""
@@@ -155,98 -127,70 +155,98 @@@ msgstr "MPI yang buruk
msgid "Bad Passphrase"
msgstr "passphrase yang buruk"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritma proteksi %d%s tidak didukung\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, 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:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
msgstr "tidak dapat membuka `%s': %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, fuzzy, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, fuzzy, c-format
msgid "shadowing the key failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, fuzzy, c-format
msgid "error writing key: %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "ubah passphrase"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
"%s%%0Awithin gpg-agent's key storage"
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: gagal membuat hashtable: %s\n"
@@@ -387,8 -305,6 +387,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "ubah passphrase"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -398,118 -314,87 +398,118 @@@ msgstr "
"Pilihan:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detil"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "lebih diam"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FILE|muat modul ekstensi FILE"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "cari kunci di keyserver"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "perbarui database trust"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, 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:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
#, fuzzy
msgid "allow presetting passphrase"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "tidak didukung"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -518,134 -403,92 +518,126 @@@ 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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Laporkan bug ke <gnupg-bugs at gnu.org>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr ""
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "file pilihan `%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, 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:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
#, 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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, 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:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, 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:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: direktori tercipta\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: read failed (n=%d): %s\n"
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: tidak dapat membuat direktori: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
@@@ -660,28 -501,22 +652,28 @@@ msgstr "
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2390
++#: agent/gpg-agent.c:2392
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "gagal perbarui rahasia: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: dilewati: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
@@@ -697,8 -530,6 +689,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -706,9 -537,6 +698,9 @@@ msgstr "
"@Perintah:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -729,40 -555,33 +721,40 @@@ msgid "
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
#, fuzzy
msgid "cancelled\n"
msgstr "Batal"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, fuzzy, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
@@@ -932,42 -722,30 +924,42 @@@ msgstr "algoritma proteksi %d%s tidak d
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "algoritma proteksi %d%s tidak didukung\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "kesalahan membaca `%s': %s\n"
@@@ -982,37 -758,15 +974,18 @@@ msgstr "kesalahan menulis keyring rahas
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "tidak dapat terkoneksi ke `%s': %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "masalah komunikasi dengan gpg-agent\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
#, fuzzy
msgid "problem setting the gpg-agent options\n"
msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- #, fuzzy
- msgid "canceled by user\n"
- msgstr "dibatalkan oleh user\n"
-
- #: common/simple-pwquery.c:579
- #, fuzzy
- msgid "problem with the agent\n"
- msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "tidak dapat meniadakan core dump: %s\n"
@@@ -1098,7 -835,6 +1071,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1122,17 -854,14 +1095,17 @@@ msgstr "
msgid "connection to agent is in restricted mode\n"
msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr ""
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1426,7 -1095,6 +1399,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
#, fuzzy
msgid "out of core\n"
msgstr "tidak diproses"
@@@ -1485,7 -1142,10 +1458,13 @@@ msgstr "kunci publik %08lX tidak ditemu
msgid "waiting for lock %s...\n"
msgstr "menulis kunci rahasia ke `%s'\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr ""
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "armor: %s\n"
@@@ -1736,10 -1341,6 +1715,10 @@@ msgstr "tidak ada kunci publik yang ses
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
@@@ -2038,27 -1574,18 +2017,27 @@@ msgstr "menulis kunci rahasia ke `%s'\n
msgid "Invalid command (try \"help\")\n"
msgstr "Perintah tidak valid (coba \"help\")\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output tidak berfungsi untuk perintah ini\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "tidak dapat membuka `%s'\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "gagal membaca keyblock: %s\n"
@@@ -2120,62 -1635,51 +2099,62 @@@ msgstr "terdapat kunci rahasia untuk ku
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "tidak dapat menggunakan paket simetri ESK karena mode S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "menggunakan cipher %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' sudah dikompresi\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "PERINGATAN: `%s' adalah file kosong\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "Membaca dari `%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "memaksa algoritma kompresi %s (%d) melanggar preferensi penerima\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s dienkripsi untuk: %s\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
@@@ -2288,8 -1771,6 +2267,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: dilewati: %s\n"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2326,8 -1800,6 +2305,8 @@@ msgstr "kesalahan penciptaan : `%s': %s
msgid "[User ID not found]"
msgstr "[User id tidak ditemukan]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opsi impor tidak valid\n"
@@@ -2396,218 -1855,169 +2375,218 @@@ msgstr "kunci tidak valid %08lX dibuat
msgid "using subkey %s instead of primary key %s\n"
msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "buat detached signature"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
#, fuzzy
msgid "make a clear text signature"
msgstr "|[file]|buat signature teks"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "buat detached signature"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "enkripsi data"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "enkripsi hanya dengan symmetric cipher"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "dekripsi data (default)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verifikasi signature"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "tampilkan kunci"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "tampilkan kunci dan signature"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "list and check key signatures"
msgstr "periksa signature kunci"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "tampilkan kunci dan fingerprint"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "tampilkan kunci rahasia"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "buat sertifikat revokasi"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "hapus kunci dari keyring publik"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "hapus kunci dari keyring pribadi"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "tandai kunci"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "tandai kunci secara lokal"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "tandai kunci"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "tandai kunci secara lokal"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "tandai atau edit kunci"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "ubah passphrase"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "ekspor kunci"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "ekspor kunci ke keyserver"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "impor kunci dari keyserver"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "cari kunci di keyserver"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "update semua kunci dari keyserver"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "impor/gabung kunci"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "perbarui database trust"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
#, fuzzy
msgid "print message digests"
msgstr "|algo [file]|cetak digest pesan"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "ciptakan output ascii"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NAMA|enkripsi untuk NAMA"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "gunakan id-user ini untuk menandai/dekripsi"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|set tingkat kompresi N (0 tidak ada)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "gunakan mode teks kanonikal"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FILE|muat modul ekstensi FILE"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "jangan buat perubahan"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "tanya sebelum menimpa"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2615,7 -2025,6 +2594,7 @@@ msgstr "
"@\n"
"(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2635,13 -2044,11 +2614,13 @@@ msgstr "
" --list-keys [nama] tampilkan kunci\n"
" --fingerprint [nama] tampilkan fingerprint\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2656,7 -2063,6 +2635,7 @@@ msgstr "
"tandai, cek, enkripsi atau dekripsi\n"
"operasi baku tergantung pada data input\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2664,609 -2070,475 +2643,604 @@@ msgstr "
"\n"
"Algoritma yang didukung:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Cipher: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Kompresi: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "pemakaian: gpg [pilihan] "
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "perintah saling konflik\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "tampilkan keyring tempat kunci yang dipilih berada"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "tiadakan kunci"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "penerima baku tidak dikenal `%s'\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "penerima baku tidak dikenal `%s'\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, fuzzy, c-format
#| msgid "NOTE: old default options file `%s' ignored\n"
msgid "Note: old default options file '%s' ignored\n"
msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr ""
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "Bukan alamat email yang valid\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritma hash tidak valid `%s'\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
#, fuzzy
msgid "invalid list options\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
#, fuzzy
msgid "invalid verify options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "tidak dapat menset path exec ke %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "PERINGATAN: program mungkin membuat file core!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "PERINGATAN: %s menimpa %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s tidak dibolehkan dengan %s!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s tidak masuk akal dengan %s!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "algoritma digest yang dipilih tidak valid\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed harus lebih dari 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed harus lebih dari 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth harus di antara 1 hingga 255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "preferensi baku tidak valid\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "preferensi cipher personal tidak valid\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "preferensi digest personal tidak valid\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "preferensi kompresi personal tidak valid\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s belum dapat dipakai dengan %s\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, fuzzy, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr ""
"anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, fuzzy, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr ""
"anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, fuzzy, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr ""
"anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
"key \n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [namafile]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [namafile]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "dekripsi gagal: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [namafile]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [namafile]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [namafile]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [namafile]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [namafile]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key id-user"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key id-user"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-user [perintah]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id-user"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Pengiriman keyserver gagal: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Penerimaan keyserver gagal: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "Ekspor kunci gagal: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "Ekspor kunci gagal: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Pencarian keyserver gagal: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh keyserver gagal: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "gagal dearmoring: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "algoritma hash tidak valid `%s'\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[namafile]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Teruskan dan ketikkan pesan anda ....\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@@ -3311,328 -2575,262 +3285,328 @@@ msgstr "Tidak tersedia bantuan
msgid "No help available for '%s'"
msgstr "Tidak tersedia bantuan untuk `%s'"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "perbarui database trust"
- #: g10/import.c:143
++#: g10/import.c:147
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "perbarui database trust"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
msgid "show key during import"
msgstr "tampilkan fingerprint"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:152
++#: g10/import.c:156
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "kunci rahasia tidak dapat dipakai"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "melewati blok tipe %d\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu kunci telah diproses\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Jumlah yang telah diproses: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " lewati kunci baru: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " lewati kunci baru: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " tanpa ID user: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " diimpor: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " tidak berubah: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " ID user baru: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " subkey baru: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " signature baru: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " pembatalan kunci baru: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " kunci rahasia dibaca: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " kunci rahasia diimpor: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " kunci rahasia tidak berubah: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " tidak diimpor: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signature baru: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " kunci rahasia dibaca: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1042
++#: g10/import.c:1048
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s signature, algoritma digest %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "kunci %08lX: tidak ada ID user\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "melewati `%s': %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1264
++#: g10/import.c:1343
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "kunci %08lX: tidak ada ID user yang valid\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "kunci %08lX: kunci baru - dilewati\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "kunci %08lX: \"%s\" %d signature baru\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "kunci %08lX: \"%s\" %d signature baru\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "kunci %08lX: \"%s\" %d signature baru\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "kunci %08lX: \"%s\" tidak berubah\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "kunci %08lX: kunci rahasia diimpor\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "dilewati: kunci pribadi telah ada\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
@@@ -3647,141 -2845,114 +3621,141 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
"pembatalan\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "kunci %08lX: subkey binding tidak valid\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "kunci %08lX: hapus subkey binding ganda\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "kunci %08lX: melewati ID user "
- #: g10/import.c:2487
++#: g10/import.c:2580
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "kunci %08lX: melewati subkey\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
@@@ -4141,8 -3250,6 +4115,8 @@@ msgstr "
msgid "Really sign? (y/N) "
msgstr "Ditandai? "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "gagal menandai: %s\n"
@@@ -4626,14 -3631,10 +4600,14 @@@ msgstr "
"Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
"kecuali anda memulai kembali program.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
#, fuzzy
msgid "revoked"
msgstr "[revoked] "
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5594,26 -4417,22 +5568,26 @@@ msgstr " Fingerprint kunci =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "memeriksa keyring `%s'\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "%lu kunci telah diperiksa (%lu signature)\n"
msgstr[1] "%lu kunci telah diperiksa (%lu signature)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5621,7 -4440,6 +5595,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 signature yang buruk\n"
msgstr[1] "1 signature yang buruk\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: keyring tercipta\n"
@@@ -5841,118 -4614,98 +5815,123 @@@ msgstr "pembatalan mandiri - gunakan \"
msgid "no signature found\n"
msgstr "Signature baik dari \""
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "signature BURUK dari \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Signature kadaluarsa dari \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Signature baik dari \""
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "verifikasi signature tidak diabaikan\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "tidak dapat menangani banyak signature ini\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Signature kadaluwarsa %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Signature membuat %.*s menggunakan kunci %s ID %08lX\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ msgid " issuer \"%s\"\n"
+ msgstr " alias \""
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "Kunci tersedia di:"
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[uncertain]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "Signature kadaluwarsa %s\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "Signature kadaluarsa pada %s \n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s signature, algoritma digest %s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "biner"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "modeteks"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "tidak dikenal"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritma pubkey tidak dikenal"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Tidak dapat memeriksa signature: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "bukan detached signature\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"PERINGATAN: multi signature terdeteksi. Hanya yang pertama akan diperiksa.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "kelas signature mandiri 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "signature model lama (PGP 2.X)\n"
@@@ -6132,88 -4850,44 +6111,55 @@@ msgstr "PERINGATAN: kunci sesi mungkin
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaket tipe %d memiliki bit kritis terset\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, fuzzy, c-format
- msgid " (main key ID %s)"
- msgstr " (ID kunci utama %08lX)"
-
- #: g10/passphrase.c:277
- #, fuzzy, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Anda perlu passphrase untuk membuka kunci rahasia untuk user:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %08lX, tercipta %s%s\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Masukkan passphrase\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "dibatalkan oleh user\n"
- #: g10/passphrase.c:483
++#: g10/passphrase.c:489
#, fuzzy, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "\n"
- "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
- "pemakai: \""
-
- #: g10/passphrase.c:491
- #, fuzzy, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr ""
+ msgid " (main key ID %s)"
+ msgstr " (ID kunci utama %08lX)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Anda ingin menghapus kunci terpilih ini? "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Anda ingin menghapus kunci terpilih ini? "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6419,126 -5058,99 +6365,126 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "Tetap gunakan kunci ini? "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "PERINGATAN: Menggunakan kunci tidak dipercaya!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr ""
"Peringatan: kunci ini mungkin dibatalkan:(kunci pembatalan tidak ada)\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pemiliknya!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Hal ini dapat berarti bahwa signature adalah palsu.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "PERINGATAN: Subkey ini telah dibatalkan oleh pemiliknya!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Catatan: Kunci ini telah ditiadakan\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Catatan: Kunci ini telah berakhir!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
"PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Tidak ada indikasi signature milik pemilik.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "PERINGATAN: Kita tidak percaya kunci ini!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " Signature mungkin palsu.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Tidak pasti signature milik pemilik.\n"
- #: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: dilewati: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: dilewati: kunci publik dimatikan\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: dilewati: kunci publik telah ada\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "algoritma hash tidak valid `%s'\n"
- #: g10/pkclist.c:991
++#: g10/pkclist.c:995
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "algoritma hash tidak valid `%s'\n"
- #: g10/pkclist.c:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6546,37 -5158,29 +6492,37 @@@ msgstr "
"\n"
"Masukkan user ID. Akhiri dengan baris kosong: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Tidak ada ID user tersebut.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
msgid "skipped: public key already set as default recipient\n"
msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
- #: g10/pkclist.c:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "Kunci publik dimatikan.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "dilewati: kunci publik telah diset\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "penerima baku tidak dikenal `%s'\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "tidak ada alamat yang valid\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "kunci %08lX: tidak ada ID user\n"
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "kunci %08lX: tidak ada ID user\n"
@@@ -6859,7 -5411,6 +6805,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
msgstr[1] "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6931,22 -5473,18 +6877,22 @@@ msgstr "
"PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar). "
"Menggunakan yang tidak expand.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s signature dari: \"%s\"\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "menandai:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s enkripsi akan digunakan\n"
@@@ -7055,7 -5573,6 +7001,7 @@@ msgstr "transaksi trustdb terlalu besar
msgid "%s: directory does not exist!\n"
msgstr "%s: direktori tidak ada!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "tidak dapat menutup `%s': %s\n"
@@@ -7167,150 -5662,117 +7113,142 @@@ msgstr "tidak dapat menangani baris tek
msgid "input line longer than %d characters\n"
msgstr "baris input lebih dari %d karakter\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Algoritma yang didukung:\n"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: kesalahan menulis dir record: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Kebijakan: "
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "tampilkan kunci"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [file]|cetak digest pesan"
msgstr[1] "|algo [file]|cetak digest pesan"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7320,93 -5782,78 +7258,93 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
msgid "Verified %ld messages signed by \"%s\"."
msgstr "|algo [file]|cetak digest pesan"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7417,20 -5864,16 +7355,20 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7447,8 -5890,6 +7385,7 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
@@@ -7987,7 -6319,6 +7924,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8043,16 -6363,13 +7980,16 @@@ msgid "
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8157,12 -6451,10 +8094,12 @@@ msgstr "
msgid "checking the CRL failed: %s"
msgstr "Gagal memeriksa signature yang dibuat: %s\n"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr ""
@@@ -8175,7 -6465,6 +8112,7 @@@ msgstr "menulis kunci rahasia ke `%s'\n
msgid "intermediate certificate not yet valid"
msgstr ""
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
#, fuzzy
msgid "certificate has expired"
msgstr "Kunci ini telah berakhir!"
@@@ -8231,7 -6509,6 +8168,7 @@@ msgstr "sertifikat yang buruk
msgid " ( issuer valid from "
msgstr ""
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "tampilkan fingerprint"
@@@ -8261,7 -6532,6 +8198,7 @@@ msgstr "buat sertifikat revokasi
msgid "self-signed certificate has a BAD signature"
msgstr ""
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr ""
@@@ -8270,29 -6539,23 +8207,29 @@@
msgid "checking the trust list failed: %s\n"
msgstr "Gagal memeriksa signature yang dibuat: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr ""
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr ""
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "verifikasi signature"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr ""
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
#, fuzzy
msgid "certificate is good\n"
msgstr "preferensi %c%lu ganda \n"
@@@ -8325,7 -6582,6 +8262,7 @@@ msgstr "
msgid "(this is the MD2 algorithm)\n"
msgstr ""
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
#, fuzzy
msgid "none"
msgstr "n|t|tidak"
@@@ -8361,36 -6612,28 +8298,36 @@@ msgstr "
"\"%.*s\"\n"
"%u-bit %s key, ID %08lX, tercipta %s%s\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr ""
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr ""
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr ""
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr ""
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr ""
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr ""
@@@ -8831,22 -6984,18 +8768,22 @@@ msgstr "
msgid "%s:%u: skipping this line\n"
msgstr " s = lewati kunci ini\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "menulis ke `%s'\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "tidak dapat menutup `%s': %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8909,7 -7046,6 +8846,7 @@@ msgstr "rev? masalah memeriksa pembatal
msgid "error storing flags: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr ""
@@@ -9028,98 -7143,73 +8965,92 @@@ msgstr "
msgid "dropping %u certificates from the cache\n"
msgstr ""
- #: dirmngr/certcache.c:352
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
- msgid "can't access directory '%s': %s\n"
- msgstr "tidak dapat membuat direktori `%s': %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't parse certificate '%s': %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, fuzzy, c-format
msgid "certificate '%s' already cached\n"
msgstr "preferensi %c%lu ganda \n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, fuzzy, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "Sertifikat pembatalan tercipta.\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, fuzzy, c-format
msgid "certificate '%s' loaded\n"
msgstr "preferensi %c%lu ganda \n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, fuzzy, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr "tampilkan fingerprint"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, fuzzy, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, fuzzy, c-format
msgid "permanently loaded certificates: %u\n"
msgstr "sertifikat yang buruk"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, fuzzy, c-format
msgid " runtime cached certificates: %u\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
#, fuzzy
msgid "certificate already cached\n"
msgstr "Sertifikat pembatalan tercipta.\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
#, fuzzy
msgid "certificate cached\n"
msgstr "preferensi %c%lu ganda \n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, fuzzy, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "kesalahan: fingerprint tidak valid\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, fuzzy, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, fuzzy, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
#, fuzzy
msgid "no issuer found in certificate\n"
msgstr "buat sertifikat revokasi"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, fuzzy, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
@@@ -9380,7 -7419,6 +9311,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
@@@ -9402,7 -7437,6 +9333,7 @@@ msgstr "respon tidak valid dari agen\n
msgid "converting S-expression failed: %s\n"
msgstr "tidak dapat membuka file: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
@@@ -9798,116 -7752,85 +9729,112 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr ""
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|muat modul ekstensi FILE"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
#, fuzzy
msgid "run without asking a user"
msgstr "Berhenti tanpa menyimpan? "
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|muat modul ekstensi FILE"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9920,91 -7843,72 +9847,91 @@@ msgstr "
"@\n"
"(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "pemakaian: gpg [pilihan] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
#, 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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "baris terlalu panjang\n"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "kesalahan: fingerprint tidak valid\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "kesalahan pembacaan: %s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
#, fuzzy
msgid "shutdown forced\n"
msgstr "tidak diproses"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10348,103 -8182,82 +10275,103 @@@ msgstr "Gagal memeriksa signature yang
msgid "not signed by a default OCSP signer's certificate"
msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, fuzzy, c-format
msgid "allocating list item failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, fuzzy, c-format
msgid "error getting responder ID: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr ""
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, fuzzy, c-format
msgid "issuer certificate not found: %s\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr ""
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
#, fuzzy
msgid "caller did not return the issuing certificate\n"
msgstr "buat sertifikat revokasi"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, fuzzy, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, fuzzy, c-format
#| msgid "%s: can't access: %s\n"
msgid "can't get authorityInfoAccess: %s\n"
msgstr "%s: tidak dapat mengakses: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
#, fuzzy
#| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
msgstr "tidak ada keyring rahasia baku: %s\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr ""
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, fuzzy, c-format
#| msgid "using cipher %s\n"
msgid "using OCSP responder '%s'\n"
msgstr "menggunakan cipher %s\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, fuzzy, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, fuzzy, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "CATATAN: kunci telah dibatalkan"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr ""
@@@ -10492,33 -8295,27 +10419,33 @@@ msgstr "gagal menghapus keyblok: %s\n
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: gagal membuat hashtable: %s\n"
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, 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:2444
++#: dirmngr/server.c:2406
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "gagal membuat kembali cache keyring: %s\n"
- #: dirmngr/server.c:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10543,34 -8336,24 +10470,30 @@@ msgstr "
msgid "checking CRL for"
msgstr "Gagal memeriksa signature yang dibuat: %s\n"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
#, fuzzy
msgid "selfsigned certificate has a BAD signature"
msgstr "verifikasi signature"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, fuzzy, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "Gagal memeriksa signature yang dibuat: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
#, fuzzy
msgid "certificate chain is good\n"
msgstr "preferensi %c%lu ganda \n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA butuh penggunaan algoritma hash 160 bit\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "q|k|keluar"
@@@ -10698,11 -8450,9 +10621,11 @@@ msgstr "
msgid "Options enforcing a passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
@@@ -10842,85 -8560,66 +10765,85 @@@ msgstr "
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
#, fuzzy
msgid "list global configuration file"
msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
#, fuzzy
msgid "check global configuration file"
msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "gunakan sebagai file output"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
#, fuzzy
msgid "Component not found"
msgstr "kunci publik tidak ditemukan"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
#, fuzzy
msgid "No argument allowed"
msgstr "menulis kunci rahasia ke `%s'\n"
@@@ -10974,123 -8664,98 +10897,123 @@@ msgid "
"Call a simple symmetric encryption tool\n"
msgstr ""
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s tidak dibolehkan dengan %s!\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "tidak dapat membuka file: %s\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, fuzzy, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "tidak dapat membuat direktori `%s': %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "tidak dapat membuka %s: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
#, fuzzy
msgid "no --program option provided\n"
msgstr "tidak ada eksekusi program remote yang didukung\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr ""
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr ""
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr ""
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr ""
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "algoritma proteksi %d%s tidak didukung\n"
diff --cc po/it.po
index 7deaf19,7be477f..0b16df4
--- a/po/it.po
+++ b/po/it.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.1.92\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2008-05-26 12:02+0200\n"
"Last-Translator: Marco d'Itri <md at linux.it>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@@ -98,14 -82,10 +98,14 @@@ msgstr "Inserisci la passphrase, cio� u
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
#, fuzzy
msgid "Passphrase:"
msgstr "passphrase errata"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr ""
@@@ -150,98 -122,70 +150,98 @@@ msgstr "MPI danneggiato
msgid "Bad Passphrase"
msgstr "passphrase errata"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "l'algoritmo di protezione %d%s non � gestito\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, 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:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
msgstr "impossibile aprire `%s': %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, fuzzy, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, fuzzy, c-format
msgid "shadowing the key failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, fuzzy, c-format
msgid "error writing key: %s\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Inserisci la passphrase, cio� una frase segreta \n"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "cambia la passphrase"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
"%s%%0Awithin gpg-agent's key storage"
msgstr "Inserisci la passphrase, cio� una frase segreta \n"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: creazione della tabella hash fallita: %s\n"
@@@ -382,8 -300,6 +382,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "cambia la passphrase"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -393,118 -309,87 +393,118 @@@ msgstr "
"Opzioni:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "prolisso"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "meno prolisso"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "cerca delle chiavi su un keyserver"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "aggiorna il database della fiducia"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, 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:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
#, fuzzy
msgid "allow presetting passphrase"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "non gestito"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -513,134 -398,92 +513,126 @@@ 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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Per favore segnala i bug a <gnupg-bugs at gnu.org>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr ""
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "file con le opzioni `%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, 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:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossibile creare %s: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
#, 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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, 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:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, 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:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: directory creata\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: read fallita (n=%d): %s\n"
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: impossibile creare la directory: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -655,28 -496,22 +647,28 @@@ msgstr "
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2390
++#: agent/gpg-agent.c:2392
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "aggiornamento della chiave segreta fallito: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: saltata: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent non � disponibile in questa sessione\n"
@@@ -692,8 -525,6 +684,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -701,9 -532,6 +693,9 @@@ msgstr "
"@Comandi:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -724,40 -550,33 +716,40 @@@ msgid "
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Inserisci la passphrase, cio� una frase segreta \n"
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Inserisci la passphrase, cio� una frase segreta \n"
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "Inserisci la passphrase, cio� una frase segreta \n"
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
#, fuzzy
msgid "cancelled\n"
msgstr "Cancella"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, fuzzy, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -927,42 -717,30 +919,42 @@@ msgstr "l'algoritmo di protezione %d%s
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "l'algoritmo di protezione %d%s non � gestito\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "errore leggendo `%s': %s\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "errore leggendo `%s': %s\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -977,37 -753,15 +969,18 @@@ msgstr "errore scrivendo il portachiav
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "impossibile connettersi a `%s': %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "problema di comunicazione con gpg-agent\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
#, fuzzy
msgid "problem setting the gpg-agent options\n"
msgstr "problema con l'agent: ha restituito 0x%lx\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- #, fuzzy
- msgid "canceled by user\n"
- msgstr "interrotto dall'utente\n"
-
- #: common/simple-pwquery.c:579
- #, fuzzy
- msgid "problem with the agent\n"
- msgstr "problema con l'agent: ha restituito 0x%lx\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "problema con l'agent: ha restituito 0x%lx\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "impossibile disabilitare i core dump: %s\n"
@@@ -1093,7 -830,6 +1066,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1117,17 -849,14 +1090,17 @@@ msgstr "
msgid "connection to agent is in restricted mode\n"
msgstr "impossibile fare questo in modo batch\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr ""
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1423,7 -1092,6 +1396,7 @@@ msgid "command \"%.50s\" is ambiguous\n
msgstr ""
# ??? (Md)
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
#, fuzzy
msgid "out of core\n"
msgstr "non esaminato"
@@@ -1482,7 -1139,10 +1455,13 @@@ msgstr "chiave pubblica %08lX non trova
msgid "waiting for lock %s...\n"
msgstr "scrittura della chiave segreta in `%s'\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr ""
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "armatura: %s\n"
@@@ -1734,10 -1339,6 +1713,10 @@@ msgstr "non c'� una chiave pubblica cor
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
@@@ -2036,27 -1572,18 +2015,27 @@@ msgstr "scrittura della chiave segreta
msgid "Invalid command (try \"help\")\n"
msgstr "Comando non valido (prova \"help\")\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output non funziona con questo comando\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "impossibile aprire `%s'\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "chiave `%s' non trovata: %s\n"
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "errore leggendo il keyblock: %s\n"
@@@ -2118,40 -1633,33 +2097,40 @@@ msgstr "c'� una chiave segreta per la c
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr ""
"impossibile usare un pacchetto ESK simmetrico a causa della modalit� S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "uso il cifrario %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' � gi� compresso\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "ATTENZIONE: `%s' � un file vuoto\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "lettura da `%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2159,7 -1667,6 +2138,7 @@@ msgstr "
"forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
"del destinatario\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2168,19 -1675,16 +2147,19 @@@ msgstr "
"forzare l'algoritmo di compressione %s (%d) viola le preferenze\n"
"del destinatario\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
"del destinatario\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrato per: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "non � possibile usare %s in modalit� %s\n"
@@@ -2295,8 -1778,6 +2274,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: saltata: %s\n"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2333,8 -1807,6 +2312,8 @@@ msgstr "errore creando `%s': %s\n
msgid "[User ID not found]"
msgstr "[User ID non trovato]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opzioni di importazione non valide\n"
@@@ -2403,218 -1862,169 +2382,218 @@@ msgstr "Chiave %08lX non valida resa va
msgid "using subkey %s instead of primary key %s\n"
msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "fai una firma separata"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
#, fuzzy
msgid "make a clear text signature"
msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "fai una firma separata"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "cifra dati"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "cifra solo con un cifrario simmetrico"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "decifra dati (predefinito)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verifica una firma"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "elenca le chiavi"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "elenca le chiavi e le firme"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "list and check key signatures"
msgstr "controlla le firme delle chiavi"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "elenca le chiavi e le impronte digitali"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "elenca le chiavi segrete"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "genera una nuova coppia di chiavi"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genera una nuova coppia di chiavi"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genera una nuova coppia di chiavi"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "genera una nuova coppia di chiavi"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "genera un certificato di revoca"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "rimuove le chiavi dal portachiavi pubblico"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "rimuove le chiavi dal portachiavi privato"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "firma una chiave"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "firma una chiave localmente"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "firma una chiave"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "firma una chiave localmente"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "firma o modifica una chiave"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "cambia la passphrase"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "esporta delle chiavi"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "esporta le chiavi a un keyserver"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "importa le chiavi da un keyserver"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "cerca delle chiavi su un keyserver"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "aggiorna tutte le chiavi da un keyserver"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "importa/aggiungi delle chiavi"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "aggiorna il database della fiducia"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
#, fuzzy
msgid "print message digests"
msgstr "|algo [files]|stampa tutti i message digests"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "crea un output ascii con armatura"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifra per NOME"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "usa questo user-id per firmare o decifrare"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|imposta il livello di compressione (0 disab.)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "usa il modo testo canonico"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "non fa cambiamenti"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "chiede prima di sovrascrivere"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2622,7 -2032,6 +2601,7 @@@ msgstr "
"@\n"
"(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2642,13 -2051,11 +2621,13 @@@ msgstr "
" --list-keys [nomi] mostra le chiavi\n"
" --fingerprint [nomi] mostra le impronte digitali\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2663,7 -2070,6 +2642,7 @@@ msgstr "
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2671,608 -2077,474 +2650,603 @@@ msgstr "
"\n"
"Algoritmi gestiti:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "A chiave pubblica: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Cifrari: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Compressione: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uso: gpg [opzioni] "
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "comandi in conflitto\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "elemento della configurazione sconosciuto \"%s\"\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "l'URL della politica di firma indicato non � valido\n"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "disabilita una chiave"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "destinatario predefinito `%s' sconosciuto\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, fuzzy, c-format
#| msgid "NOTE: old default options file `%s' ignored\n"
msgid "Note: old default options file '%s' ignored\n"
msgstr ""
"NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr ""
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "NOTA: %s normalmente non deve essere usato!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "L'indirizzo di email non � valido\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritmo di hash non valido `%s'\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
#, fuzzy
msgid "invalid list options\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "l'URL della politica di firma indicato non � valido\n"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
#, fuzzy
msgid "invalid verify options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "impossibile impostare exec-path a %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Non � permesso usare %s con %s!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "Non ha senso usare %s con %s!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non � valido\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non � valido\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non � valido\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non � valido\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve essere maggiore di 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve essere maggiore di 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth deve essere tra 1 e 255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "preferenze predefinite non valide\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "preferenze personali del cifrario non valide\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "preferenze personali del digest non valide\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "preferenze personali di compressione non valide\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s non funziona ancora con %s\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, fuzzy, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "non � possibile usare l'algoritmo di cifratura \"%s\" in modalit� %s\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, fuzzy, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "non � possibile usare l'algoritmo di digest \"%s\" in modalit� %s\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, fuzzy, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr ""
"non � possibile usare l'algoritmo di compressione \"%s\" in modalit� %s\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
"crittografia a chiave pubblica\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [nomefile]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [nomefile]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "decifratura fallita: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [nomefile]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "non � possibile usare %s in modalit� %s\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [nomefile]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "non � possibile usare %s in modalit� %s\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nomefile]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [nomefile]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [nomefile]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [comandi]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "invio al keyserver fallito: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "ricezione dal keyserver fallita: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "esportazione della chiave fallita: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "esportazione della chiave fallita: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ricerca nel keyserver fallita: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aggiornamento del keyserver fallito: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "rimozione dell'armatura fallita: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "algoritmo di hash non valido `%s'\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[nomefile]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Vai avanti e scrivi il messaggio...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL della politica di certificazione indicato non � valido\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL della politica di firma indicato non � valido\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "l'URL della politica di firma indicato non � valido\n"
@@@ -3317,328 -2581,262 +3291,328 @@@ msgstr "Non � disponibile un aiuto
msgid "No help available for '%s'"
msgstr "Non � disponibile un aiuto per `%s'"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "aggiorna il database della fiducia"
- #: g10/import.c:143
++#: g10/import.c:147
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "aggiorna il database della fiducia"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
msgid "show key during import"
msgstr "mostra le impronte digitali"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:152
++#: g10/import.c:156
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "chiave segreta inutilizzabile"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "salto un blocco di tipo %d\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "Per ora sono state esaminate %lu chiavi\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Numero totale esaminato: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " nuove chiavi saltate: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " nuove chiavi saltate: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " senza user ID: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importate: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " non modificate: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nuovi user ID: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nuove subchiavi: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " nuove firme: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr "nuove revoche di chiavi: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chiavi segrete lette: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "chiavi segrete importate: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "chiavi segrete non cambiate: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " importate: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " nuove firme: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " chiavi segrete lette: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1042
++#: g10/import.c:1048
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "Firma %s, algoritmo di digest %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chiave %08lX: nessun user ID\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "saltata `%s': %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1264
++#: g10/import.c:1343
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "chiave %08lX: riparati i danni di HKP alla subchiave\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "chiave %08lX: nessun user ID valido\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "questo pu� essere causato da una autofirma mancante\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "chiave %08lX: nuova chiave - saltata\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chiave %08lX: \"%s\" una nuova firma\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chiave %08lX: \"%s\" non cambiata\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chiave %08lX: chiave segreta importata\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "saltata: chiave pubblica gi� presente\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "chiave segreta `%s' non trovata: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
@@@ -3653,144 -2851,117 +3627,144 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
"certificato di revoca\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "chiave %08lX: nessun user ID per la firma\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chiave %08lX: legame con la subchiave non valido:\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "chiave %08lX: non ci sono subchiavi per la revoca della chiave\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "chiave %08lX: revoca della subchiave non valida\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chiave %08lX: saltato l'user ID '"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chiave %08lX: saltata la subchiave\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltata\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "chiave %08lX: certificato di revoca non valido: %s - saltata\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"ATTENZIONE: la chiave %08lX pu� essere stata revocata: scarico la chiave\n"
"di revoca %08lX.\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"ATTENZIONE: la chiave %08lX pu� essere stata revocata: la chiave di\n"
"revoca %08lX non � presente.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
@@@ -4148,8 -3257,6 +4122,8 @@@ msgstr "
msgid "Really sign? (y/N) "
msgstr "Firmo davvero? "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallita: %s\n"
@@@ -4634,14 -3639,10 +4608,14 @@@ msgstr "
"corretta\n"
"finch� non eseguirai di nuovo il programma.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
#, fuzzy
msgid "revoked"
msgstr "[revocata]"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5611,26 -4434,22 +5585,26 @@@ msgstr " Impronta digitale =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "controllo il portachiavi `%s'\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "Sono state controllate %lu chiavi (%lu firme)\n"
msgstr[1] "Sono state controllate %lu chiavi (%lu firme)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5638,7 -4457,6 +5612,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "una firma non corretta\n"
msgstr[1] "una firma non corretta\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: portachiavi creato\n"
@@@ -5859,117 -4632,97 +5833,122 @@@ msgstr "revoca solitaria - usa \"gpg --
msgid "no signature found\n"
msgstr "Firma valida da \""
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Firma NON corretta da \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Firma scaduta da \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Firma valida da \""
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "verifica della firma soppressa\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "impossibile gestire queste firme multiple\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Firma scaduta il %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Firma fatta %.*s usando %s con ID %08lX\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ msgid " issuer \"%s\"\n"
+ msgstr " alias \""
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "Chiave disponibile presso: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[incerta]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "Firma scaduta il %s\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "Questa firma scadr� il %s\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "Firma %s, algoritmo di digest %s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "binario"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "modo testo"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "sconosciuto"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritmo della chiave pubblica sconosciuto"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossibile controllare la firma: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "non � una firma separata\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "ATTENZIONE: trovate firme multiple. Sar� controllata solo la prima.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "firma solitaria di classe 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "firma vecchio stile (PGP 2.x)\n"
@@@ -6155,88 -4873,44 +6134,55 @@@ msgstr "
msgid "subpacket of type %d has critical bit set\n"
msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "problema con l'agent: ha restituito 0x%lx\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, fuzzy, c-format
- msgid " (main key ID %s)"
- msgstr " (key ID principale %08lX)"
-
- #: g10/passphrase.c:277
- #, fuzzy, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Ti serve una passphrase per sbloccare la chiave segreta dell'utente:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %08lX, created %s%s\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Inserisci la passphrase\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "interrotto dall'utente\n"
- #: g10/passphrase.c:483
++#: g10/passphrase.c:489
#, fuzzy, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "\n"
- "Ti serve una passphrase per sbloccare la chiave segreta\n"
- "dell'utente: \""
-
- #: g10/passphrase.c:491
- #, fuzzy, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr ""
+ msgid " (main key ID %s)"
+ msgstr " (key ID principale %08lX)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Inserisci la passphrase, cio� una frase segreta \n"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Inserisci la passphrase, cio� una frase segreta \n"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Inserisci la passphrase, cio� una frase segreta \n"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Inserisci la passphrase, cio� una frase segreta \n"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Vuoi davvero cancellare le chiavi selezionate? "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Vuoi davvero cancellare le chiavi selezionate? "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6443,128 -5082,101 +6389,128 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "Uso lo stesso questa chiave? "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr ""
"ATTENZIONE: questa chiave pu� essere stata revocata (la chiave di revoca\n"
"non � presente).\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr ""
"ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Questo pu� significare che la firma � stata falsificata.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "ATTENZIONE: questa subchiave � stata revocata dal proprietario!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Nota: questa chiave � stata disabilitata.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Nota: questa chiave � scaduta!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "ATTENZIONE: questa chiave non � certificata con una firma fidata!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Non ci sono indicazioni che la firma appartenga al proprietario.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " La firma � probabilmente un FALSO.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"ATTENZIONE: questa chiave non � certificata con firme abbastanza fidate!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
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:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: saltata: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: saltata: chiave pubblica disabilitata\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: saltata: chiave pubblica gi� presente\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, 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:991
++#: g10/pkclist.c:995
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "algoritmo di hash non valido `%s'\n"
- #: g10/pkclist.c:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6572,37 -5184,29 +6518,37 @@@ msgstr "
"\n"
"Inserisci l'user ID. Termina con una riga vuota: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "User ID inesistente.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
msgid "skipped: public key already set as default recipient\n"
msgstr "saltata: chiave pubblica gi� impostata come destinatario predefinito\n"
- #: g10/pkclist.c:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "La chiave pubblica � disabilitata.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "saltata: chiave pubblica gi� impostata\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "nessun indirizzo valido\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "chiave %08lX: nessun user ID\n"
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "chiave %08lX: nessun user ID\n"
@@@ -6889,7 -5441,6 +6835,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "la chiave pubblica %08lX � pi� recente della firma di %lu secondo\n"
msgstr[1] "la chiave pubblica %08lX � pi� recente della firma di %lu secondo\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6971,23 -5513,19 +6917,23 @@@ msgstr "
"lunga).\n"
"Usata inespansa.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "Firma %s da: \"%s\"\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "firma:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "sar� usato il cifrario %s\n"
@@@ -7096,7 -5614,6 +7042,7 @@@ msgstr "transazione del trustdb troppo
msgid "%s: directory does not exist!\n"
msgstr "%s: la directory non esiste!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "impossibile chiudere `%s': %s\n"
@@@ -7208,150 -5703,117 +7154,142 @@@ msgstr "impossibile gestire linee di te
msgid "input line longer than %d characters\n"
msgstr "linea di input pi� lunga di %d caratteri\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Algoritmi gestiti:\n"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: errore durante la scrittura del dir record: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Policy: "
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "elenca le chiavi"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [files]|stampa tutti i message digests"
msgstr[1] "|algo [files]|stampa tutti i message digests"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7361,93 -5823,78 +7299,93 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
msgid "Verified %ld messages signed by \"%s\"."
msgstr "|algo [files]|stampa tutti i message digests"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7458,20 -5905,16 +7396,20 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7488,8 -5931,6 +7426,7 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -8029,7 -6361,6 +7966,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8085,16 -6405,13 +8022,16 @@@ msgid "
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8199,12 -6493,10 +8136,12 @@@ msgstr "
msgid "checking the CRL failed: %s"
msgstr "controllo della firma creata fallito: %s\n"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr ""
@@@ -8217,7 -6507,6 +8154,7 @@@ msgstr "scrittura della chiave segreta
msgid "intermediate certificate not yet valid"
msgstr ""
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
#, fuzzy
msgid "certificate has expired"
msgstr "Questa chiave � scaduta!"
@@@ -8273,7 -6551,6 +8210,7 @@@ msgstr "certificato danneggiato
msgid " ( issuer valid from "
msgstr ""
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "mostra le impronte digitali"
@@@ -8303,7 -6574,6 +8240,7 @@@ msgstr "genera un certificato di revoca
msgid "self-signed certificate has a BAD signature"
msgstr ""
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr ""
@@@ -8312,29 -6581,23 +8249,29 @@@
msgid "checking the trust list failed: %s\n"
msgstr "controllo della firma creata fallito: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr ""
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr ""
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "verifica una firma"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr ""
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
#, fuzzy
msgid "certificate is good\n"
msgstr "la preferenza %c%lu � doppia\n"
@@@ -8367,7 -6624,6 +8304,7 @@@ msgstr "
msgid "(this is the MD2 algorithm)\n"
msgstr ""
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
#, fuzzy
msgid "none"
msgstr "no"
@@@ -8403,36 -6654,28 +8340,36 @@@ msgstr "
"\"%.*s\"\n"
"%u-bit %s key, ID %08lX, created %s%s\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr ""
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr ""
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr ""
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr ""
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr ""
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr ""
@@@ -8872,22 -7025,18 +8809,22 @@@ msgstr "
msgid "%s:%u: skipping this line\n"
msgstr " s = salta questa chiave\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "scrittura in `%s'\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "impossibile chiudere `%s': %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8950,7 -7087,6 +8887,7 @@@ msgstr "rev? problema controllando la r
msgid "error storing flags: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr ""
@@@ -9069,98 -7184,73 +9006,92 @@@ msgstr "
msgid "dropping %u certificates from the cache\n"
msgstr ""
- #: dirmngr/certcache.c:352
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
- msgid "can't access directory '%s': %s\n"
- msgstr "impossibile creare la directory `%s': %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't parse certificate '%s': %s\n"
msgstr "impossibile creare `%s': %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, fuzzy, c-format
msgid "certificate '%s' already cached\n"
msgstr "la preferenza %c%lu � doppia\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, fuzzy, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "Certificato di revoca creato.\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, fuzzy, c-format
msgid "certificate '%s' loaded\n"
msgstr "la preferenza %c%lu � doppia\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, fuzzy, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr "mostra le impronte digitali"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, fuzzy, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, fuzzy, c-format
msgid "permanently loaded certificates: %u\n"
msgstr "certificato danneggiato"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, fuzzy, c-format
msgid " runtime cached certificates: %u\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
#, fuzzy
msgid "certificate already cached\n"
msgstr "Certificato di revoca creato.\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
#, fuzzy
msgid "certificate cached\n"
msgstr "la preferenza %c%lu � doppia\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, fuzzy, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "errore: impronta digitale non valida\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, fuzzy, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, fuzzy, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
#, fuzzy
msgid "no issuer found in certificate\n"
msgstr "genera un certificato di revoca"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, fuzzy, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
@@@ -9422,7 -7461,6 +9353,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
@@@ -9444,7 -7479,6 +9375,7 @@@ msgstr "risposta non valida dall'agent\
msgid "converting S-expression failed: %s\n"
msgstr "impossibile aprire il file: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
@@@ -9841,116 -7795,85 +9772,112 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr ""
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
#, fuzzy
msgid "run without asking a user"
msgstr "Esco senza salvare? "
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9963,92 -7886,73 +9890,92 @@@ msgstr "
"@\n"
"(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uso: gpg [opzioni] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
#, 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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "riga troppo lunga\n"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "errore: impronta digitale non valida\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "errore di lettura: %s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
# ??? (Md)
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
#, fuzzy
msgid "shutdown forced\n"
msgstr "non esaminato"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10392,103 -8226,82 +10319,103 @@@ msgstr "controllo della firma creata fa
msgid "not signed by a default OCSP signer's certificate"
msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, fuzzy, c-format
msgid "allocating list item failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, fuzzy, c-format
msgid "error getting responder ID: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr ""
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, fuzzy, c-format
msgid "issuer certificate not found: %s\n"
msgstr "chiave `%s' non trovata: %s\n"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr ""
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
#, fuzzy
msgid "caller did not return the issuing certificate\n"
msgstr "genera un certificato di revoca"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, fuzzy, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, fuzzy, c-format
#| msgid "%s: can't access: %s\n"
msgid "can't get authorityInfoAccess: %s\n"
msgstr "%s: impossibile acedere a: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
#, fuzzy
#| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
msgstr "nessun portachiavi segreto predefinito: %s\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr ""
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, fuzzy, c-format
#| msgid "using cipher %s\n"
msgid "using OCSP responder '%s'\n"
msgstr "uso il cifrario %s\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, fuzzy, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, fuzzy, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "NOTA: la chiave � stata revocata"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr ""
@@@ -10536,33 -8339,27 +10463,33 @@@ msgstr "cancellazione del keyblock fall
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "impossibile creare `%s': %s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: creazione della tabella hash fallita: %s\n"
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, 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:2444
++#: dirmngr/server.c:2406
#, 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:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10587,34 -8380,24 +10514,30 @@@ msgstr "
msgid "checking CRL for"
msgstr "controllo della firma creata fallito: %s\n"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
#, fuzzy
msgid "selfsigned certificate has a BAD signature"
msgstr "verifica una firma"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, fuzzy, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "controllo della firma creata fallito: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
#, fuzzy
msgid "certificate chain is good\n"
msgstr "la preferenza %c%lu � doppia\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "quit"
@@@ -10742,11 -8494,9 +10665,11 @@@ msgstr "
msgid "Options enforcing a passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
@@@ -10886,85 -8604,66 +10809,85 @@@ msgstr "
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
#, fuzzy
msgid "list global configuration file"
msgstr "elemento della configurazione sconosciuto \"%s\"\n"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
#, fuzzy
msgid "check global configuration file"
msgstr "elemento della configurazione sconosciuto \"%s\"\n"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "usa come file di output"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
#, fuzzy
msgid "Component not found"
msgstr "chiave pubblica non trovata"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
#, fuzzy
msgid "No argument allowed"
msgstr "scrittura della chiave segreta in `%s'\n"
@@@ -11018,123 -8708,98 +10941,123 @@@ msgid "
"Call a simple symmetric encryption tool\n"
msgstr ""
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "Non � permesso usare %s con %s!\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "impossibile aprire il file: %s\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, fuzzy, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "impossibile creare la directory `%s': %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "impossibile aprire `%s': %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
#, fuzzy
msgid "no --program option provided\n"
msgstr "l'esecuzione remota dei programmi non � gestita\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr ""
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr ""
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "impossibile creare %s: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "impossibile creare %s: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr ""
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "impossibile creare `%s': %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "impossibile creare `%s': %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr ""
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "l'algoritmo di protezione %d%s non � gestito\n"
diff --cc po/ja.po
index 5f8a001,9048df6..d29035b
--- a/po/ja.po
+++ b/po/ja.po
@@@ -8,10 -8,9 +8,10 @@@
#
msgid ""
msgstr ""
- "Project-Id-Version: gnupg 2.1.12\n"
+ "Project-Id-Version: gnupg 2.1.15\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
- "PO-Revision-Date: 2016-06-07 14:12+0900\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
+ "PO-Revision-Date: 2016-08-04 17:30+0900\n"
"Last-Translator: NIIBE Yutaka <gniibe at fsij.org>\n"
"Language-Team: none\n"
"Language: ja\n"
@@@ -103,13 -87,9 +103,13 @@@ msgstr "
msgid "PIN:"
msgstr "PIN:"
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
msgid "Passphrase:"
msgstr "パスフレーズ:"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr "一致しません - もう一度"
@@@ -149,64 -121,42 +149,64 @@@ msgstr "不正なPINです
msgid "Bad Passphrase"
msgstr "パスフレーズが不正です"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh鍵で%dビットより大きいものはサポートされません\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, c-format
msgid "can't create '%s': %s\n"
msgstr "'%s'が作成できません: %s\n"
- #: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, c-format
msgid "can't open '%s': %s\n"
msgstr "'%s'が開けません: %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "カード・シリアル番号の取得エラー: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "カードを検出しました。シリアル番号: %s\n"
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "カードにsshの認証鍵がありません: %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "適当なカードの鍵が見つかりません: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, c-format
msgid "shadowing the key failed: %s\n"
msgstr "鍵のシャドウ化に失敗しました: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, c-format
msgid "error writing key: %s\n"
msgstr "鍵の書き込みエラー: %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -215,24 -165,19 +215,24 @@@ msgstr "
"sshプロセスが以下の鍵の使用を要求しました:%%0A %s%%0A (%s)%%0Aこの使用を認"
"めますか?"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr "許可する"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr "拒否する"
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "以下のssh鍵に対するパスフレーズを入力してください:%%0A %F%%0A (%c)"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "このパスフレーズをもう一度入力してください"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -241,7 -186,6 +241,7 @@@ msgstr "
"パスフレーズを入力してください。gpg-agentの鍵の保管で受信した秘密鍵%%0A %s"
"%%0A %s%%0Aを保護します。"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "ソケットからストリームを作成するのに失敗しました: %s\n"
@@@ -373,8 -291,6 +373,8 @@@ msgstr "新しい鍵を保護するた�
msgid "Please enter the new passphrase"
msgstr "新しいパスフレーズを入力してください"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -382,128 -298,90 +382,128 @@@ msgstr "
"@オプション:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr "デーモン・モードで実行 (バックグラウンド)"
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr "サーバ・モードで実行 (フォアグラウンド)"
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "冗長"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "いくらかおとなしく"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr "sh-形式のコマンド出力"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr "csh-形式のコマンド出力"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FILE|FILEからオプションを読み込みます"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr "コンソールからデタッチしない"
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr "キーボードとマウスを占有しない"
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "サーバのログ・ファイルを使う"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|PGMをPIN入力プログラムとして使う"
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|PGMをSCdaemonプログラムとして使う"
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
msgid "do not use the SCdaemon"
msgstr "SCdaemonを使わない"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|NAMEからのコマンドを受け付ける"
- #: agent/gpg-agent.c:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr "TTYの変更要求を無視する"
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr "Xディスプレイの変更要求を無視する"
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|N秒後に保持したPINを無効とする"
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr "署名に対してPINの保持を使わない"
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
msgid "disallow the use of an external password cache"
msgstr "外部のパスワードキャッシュの使用を認めない"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr "クライアントが鍵に\"trusted\"マークをつけることを認めない"
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
msgid "allow presetting passphrase"
msgstr "パスフレーズの事前設定を認める"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr "pinentryより優先してパスフレーズ入力を認めない"
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr "Emacsを通じてパスフレーズを催促することを認める"
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
msgid "enable ssh support"
msgstr "sshサポートを有功にする"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "バグは <@EMAIL@> までご報告ください。\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "使い方: @GPG_AGENT@ [オプション] (ヘルプは -h)"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -511,107 -389,72 +511,99 @@@ msgstr "
"形式: @GPG_AGENT@ [オプション] [コマンド [引数]]\n"
"@GnuPG@の秘密鍵の管理\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "無効なdebug-level '%s'が与えられました\n"
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr "%s が古すぎます (%s が必要、現在 %s)\n"
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "*注意*: デフォルトのオプション・ファイル '%s' がありません\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, c-format
msgid "option file '%s': %s\n"
msgstr "オプション・ファイル '%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, c-format
msgid "reading options from '%s'\n"
msgstr "'%s' からオプションを読み込みます\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "*注意*: '%s'はオプションとは考えられません\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, c-format
msgid "can't create socket: %s\n"
msgstr "ソケットが作成できません: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "ソケット名'%s'は長すぎます\n"
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agentは既に実行されています - 新しいものをスタートさせません\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
msgid "error getting nonce for the socket\n"
msgstr "ソケットのナンス取得エラー\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "'%s'でソケットのバインドのエラー: %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "'%s'の許可が設定できません: %s\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() に失敗しました: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, c-format
msgid "listening on socket '%s'\n"
msgstr "ソケット'%s'でlisten\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "ディレクトリ'%s'が作成できません: %s\n"
- #: agent/gpg-agent.c:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "ディレクトリ'%s'が作成されました\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "'%s'でstat()が失敗しました: %s\n"
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "'%s'をホーム・ディレクトリに使えません\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fd %dでナンスの読み込みエラー: %s\n"
@@@ -626,28 -467,22 +618,28 @@@ msgstr "ハンドラ0x%lx (fd %d に対
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "ハンドラ0x%lx (fd %d に対する)が終了\n"
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh ハンドラ0x%lx (fd %d に対する)が開始\n"
- #: agent/gpg-agent.c:2390
++#: agent/gpg-agent.c:2392
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh ハンドラ0x%lx (fd %d に対する)が終了\n"
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_pselectに失敗しました: %s - 一秒待ちます\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s 停止しました\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "このセッションでgpg-agentは実行されていません\n"
@@@ -663,8 -496,6 +655,8 @@@ msgstr "
"形式: gpg-preset-passphrase [オプション] KEYGRIP\n"
"パスワードキャッシュの管理\n"
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -672,9 -503,6 +664,9 @@@ msgstr "
"@コマンド:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -696,16 -522,13 +688,16 @@@ msgstr "
"形式: gpg-protect-tool [オプション] [引数]\n"
"秘密鍵管理ツール\n"
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "パスフレーズを入力してください。PKCS#12オブジェクトを解除します。"
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr ""
"パスフレーズを入力してください。新しいPKCS#12オブジェクトを解除します。"
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
@@@ -713,7 -536,6 +705,7 @@@ msgstr "
"GnuPGシステムにインポートされたオブジェクトを保護するためにパスフレーズを入力"
"してください"
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -721,16 -543,13 +713,16 @@@ msgstr "
"パスフレーズまたはPINを入力してください。\n"
"この操作を完了するのに必要です。"
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
msgid "cancelled\n"
msgstr "キャンセルされました\n"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "パスフレーズを問い合わせする際、エラー: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, c-format
msgid "error opening '%s': %s\n"
msgstr "'%s'を開く際、エラー: %s\n"
@@@ -900,42 -690,30 +892,42 @@@ msgstr "保護アルゴリズム%d (%s)
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "保護ハッシュ・アルゴリズム%d (%s)はサポートされていません\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "パイプの作成エラー: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "パイプのストリーム作成エラー: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, c-format
msgid "error forking process: %s\n"
msgstr "プロセスforkエラー: %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "プロセスの終了待ちが失敗: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr "'%s'の実行エラー: おそらくインストールされていません\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "'%s'の実行エラー: exitステイタス %d\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, c-format
msgid "error running '%s': terminated\n"
msgstr "'%s'の実行エラー: 終了しました\n"
@@@ -950,33 -726,13 +942,16 @@@ msgstr "プロセス %d のexitコー�
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "プロセス%dの終了待ちが失敗: %s\n"
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "'%s'へ接続できません: %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "gpg-agentとの通信障害\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
msgid "problem setting the gpg-agent options\n"
msgstr "gpg-agentオプションの設定の問題\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- msgid "canceled by user\n"
- msgstr "ユーザによる取消し\n"
-
- #: common/simple-pwquery.c:579
- msgid "problem with the agent\n"
- msgstr "エージェントに障害\n"
-
- #: common/simple-pwquery.c:701
- #, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "エージェントに問題 (予期しない応答 \"%s\")\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "コア・ダンプを無効にできません: %s\n"
@@@ -1063,7 -802,6 +1038,7 @@@ msgid "WARNING: \"%s%s\" is an obsolet
msgstr ""
"*警告*: \"%s%s\"は、使われなくなったオプションです - なんの効果もありません\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr "未知のdebugフラグ'%s'は無視されました\n"
@@@ -1086,17 -820,14 +1061,17 @@@ msgstr "エージェントへの接続�
msgid "connection to agent is in restricted mode\n"
msgstr "エージェントへの接続は制限モードです。\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr "dirmngrが動いていません - 開始します'%s'\n"
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "dirmngrの起動のため、%d秒待ちます\n"
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr "dirmngrへの接続が確立しました\n"
@@@ -1354,7 -1025,6 +1329,7 @@@ msgstr "オプション\"%.50s\"はあ�
msgid "command \"%.50s\" is ambiguous\n"
msgstr "コマンド\"%.50s\"はあいまいです\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
msgid "out of core\n"
msgstr "メモリがありません\n"
@@@ -1412,7 -1071,10 +1387,13 @@@ msgstr "lock '%s' は作成されませ
msgid "waiting for lock %s...\n"
msgstr "lock %s を待ちます...\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr "%s が古すぎます (%s が必要、現在 %s)\n"
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "外装: %s\n"
@@@ -1640,10 -1247,6 +1621,10 @@@ msgstr "公開鍵を取得するURL:
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "エラー: URLが長すぎます (上限%d文字)。\n"
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, c-format
msgid "error reading '%s': %s\n"
msgstr "'%s'の読み込みエラー: %s\n"
@@@ -1922,26 -1460,17 +1903,26 @@@ msgstr "管理者コマンドは禁止�
msgid "Invalid command (try \"help\")\n"
msgstr "無効なコマンド (\"help\"を参照)\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "このコマンドで--outputは機能しません\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "'%s'が開けません\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "鍵\"%s\"が見つかりません: %s\n"
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "鍵ブロックの読み込みエラー: %s\n"
@@@ -1998,43 -1515,35 +1979,43 @@@ msgstr "この公開鍵にたいする�
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "まず\"--delete-secret-keys\"オプションでこれを削除してください。\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "パスフレーズの作成エラー: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "S2Kモードのため、共通鍵ESKパケットを使えません\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "暗号方式 %s を使います\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, c-format
msgid "'%s' already compressed\n"
msgstr "'%s'はもう圧縮済みです\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "*警告*: '%s'は空のファイルです\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, c-format
msgid "reading from '%s'\n"
msgstr "'%s'から読み込み\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"*警告*: 共通鍵暗号方式 %s (%d) の強制が、受取人の優先指定をそむきます\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2042,17 -1551,14 +2023,17 @@@
msgstr ""
"*警告*: 圧縮アルゴリズム %s (%d) の強制が、受取人の優先指定をそむきます\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "共通鍵暗号方式 %s (%d) の強制が、受取人の優先指定をそむきます\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s暗号化 受信者:\"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "%sを%sモードで使うことはできません\n"
@@@ -2154,8 -1639,6 +2135,8 @@@ msgstr "エクスポートの際、で�
msgid " - skipped"
msgstr " - スキップされました"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, c-format
msgid "writing to '%s'\n"
msgstr "'%s'への書き込み\n"
@@@ -2188,8 -1664,6 +2169,8 @@@ msgstr "'%s'の作成エラー: %s\n
msgid "[User ID not found]"
msgstr "[ユーザIDが見つかりません]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(オプション'%s'の引数を確認ください)\n"
@@@ -2254,201 -1715,150 +2235,199 @@@ msgstr "--allow-non-selfsigned-uidで�
msgid "using subkey %s instead of primary key %s\n"
msgstr "副鍵%s(主鍵%sではなく)を用います\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
msgid "make a signature"
msgstr "署名を作成"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
msgid "make a clear text signature"
msgstr "クリア・テクスト署名を作成"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "分遣署名を作成"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "データを暗号化"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "暗号化には共通鍵暗号方式のみを使用"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "データを復号 (デフォルト)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "署名を検証"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "鍵の一覧"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "鍵と署名の一覧"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "list and check key signatures"
msgstr "鍵署名の検査と一覧"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "鍵とフィンガープリントの一覧"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "秘密鍵の一覧"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "新しい鍵ペアを生成"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
msgid "quickly generate a new key pair"
msgstr "すばやく新しい鍵ペアを生成"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
msgid "quickly add a new user-id"
msgstr "すばやく新しいユーザIDを追加"
- #: g10/gpg.c:442
- #, fuzzy
- #| msgid "quickly add a new user-id"
++#: g10/gpg.c:445
msgid "quickly revoke a user-id"
- msgstr "すばやく新しいユーザIDを追加"
+ msgstr "すばやくユーザIDを失効"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr "全機能の鍵ペアを生成"
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "失効証明書を生成"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "公開鍵リングから鍵を削除"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "秘密鍵リングから鍵を削除"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
msgid "quickly sign a key"
msgstr "鍵にすばやく署名"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
msgid "quickly sign a key locally"
msgstr "鍵へすばやくローカルに署名"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "鍵に署名"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "鍵へローカルに署名"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "鍵への署名や編集"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "パスフレーズの変更"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "鍵をエクスポートする"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "鍵サーバに鍵をエクスポートする"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "鍵サーバから鍵をインポートする"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "鍵サーバの鍵を検索する"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "鍵サーバから鍵を全部更新する"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "鍵のインポート/マージ"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr "カード・ステイタスを表示"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr "カードのデータを変更"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr "カードのPINを変更"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "信用データベースを更新"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
msgid "print message digests"
msgstr "メッセージ・ダイジェストを表示"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "サーバ・モードで実行"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|VALUE|TOFUポリシーを鍵に設定する"
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "ASCII形式の外装を作成"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|USER-ID用に暗号化"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|署名や復号にこのUSER-IDを使用"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|圧縮レベルをNに設定 (0は非圧縮)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "正準テキスト・モードを使用"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FILE|出力をFILEに書き出す"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "無変更"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "上書き前に確認"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr "厳密なOpenPGPの振舞を採用"
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2456,7 -1866,6 +2435,7 @@@ msgstr "
"@\n"
"(コマンドとオプション全部の一覧は、マニュアル・ページをご覧ください)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2476,11 -1885,9 +2455,11 @@@ msgstr "
" --list-keys [名前] 鍵を表示\n"
" --fingerprint [名前] フィンガープリントを表示\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "使い方: @GPG@ [オプション] [ファイル] (ヘルプは -h)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2490,7 -1897,6 +2469,7 @@@ msgstr "
"署名、検査、暗号化または復号\n"
"デフォルトの操作は、入力データに依存\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2498,582 -1904,448 +2477,577 @@@ msgstr "
"\n"
"サポートしているアルゴリズム:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "公開鍵: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "暗号方式: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "ハッシュ: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "圧縮: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "使い方: %s [オプション] %s\n"
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "対立するコマンド\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "=記号が、グループ定義'%s'内に見つかりません\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない所有\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない所有\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない所有\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない許可\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない許可\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない許可\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ所有\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr ""
"*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ所有\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ所有\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr ""
"*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "不明のコンフィグレーション項目'%s'\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr "鍵の一覧時にフォトIDを表示する"
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
msgid "show key usage information during key listings"
msgstr "鍵の一覧時に鍵の使い方の情報を表示する"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr "署名の一覧時にポリシーURLを表示する"
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
msgid "show all notations during signature listings"
msgstr "署名の一覧時にすべての注釈を表示する"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr "署名の一覧時にIETF標準注釈を表示する"
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr "署名の一覧時にユーザの注釈を表示する"
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
msgid "show preferred keyserver URLs during signature listings"
msgstr "署名の一覧時に優先鍵サーバURLを表示する"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr "鍵の一覧時にユーザIDの有効性を表示する"
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr "鍵の一覧に失効したユーザID、期限切れとなったユーザIDを表示する"
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr "鍵の一覧に失効した副鍵、期限切れとなった副鍵を表示する"
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
msgid "show the keyring name in key listings"
msgstr "鍵の一覧に鍵リングの名前を表示する"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
msgid "show expiration dates during signature listings"
msgstr "署名の一覧時に有効期限の日付を表示する"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
msgid "available TOFU policies:\n"
msgstr "利用可能なTOFUポリシー:\n"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "不明のTOFUポリシー'%s'\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr "(選択肢の一覧には\"help\"を使ってください)\n"
- #: g10/gpg.c:2041
- #, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "不明のTOFU DBフォーマット'%s'\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "*注意*: 以前デフォルトだったオプション・ファイル'%s'は、無視されます\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr "libgcrypt が古すぎます (必要 %s, 現在 %s)\n"
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "*注意*: 普通%sは使いません!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s'は、有効な署名表現ではありません\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ #| msgid "line %d: not a valid email address\n"
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "行 %d: 有効な電子メール・アドレスではありません\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "無効な pinentry mode '%s'です\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "'%s'は、有効な文字集合ではありません\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "鍵サーバのURLを解析不能\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: 無効な鍵サーバ・オプションです\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
msgid "invalid keyserver options\n"
msgstr "無効な鍵サーバ・オプションです\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: 無効なインポート・オプションです\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "無効なインポート・オプションです\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
- #, fuzzy, c-format
- #| msgid "invalid list options\n"
++#: g10/gpg.c:3061 g10/gpg.c:3076
+ #, c-format
msgid "invalid filter option: %s\n"
- msgstr "無効な一覧オプションです\n"
+ msgstr "無効なフィルタ・オプションです: %s\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: 無効なエクスポート・オプションです\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "無効なエクスポート・オプションです\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: 無効な一覧オプションです\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
msgid "invalid list options\n"
msgstr "無効な一覧オプションです\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr "署名の検証時にフォトIDを表示する"
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr "署名の検証時にポリシーURLを表示する"
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
msgid "show all notations during signature verification"
msgstr "署名の検証時にすべての注釈を表示する"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr "署名の検証時にIETF標準注釈を表示する"
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr "署名の検証時にユーザの注釈を表示する"
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
msgid "show preferred keyserver URLs during signature verification"
msgstr "署名の検証時に優先鍵サーバURLを表示する"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
msgid "show user ID validity during signature verification"
msgstr "署名の検証時にユーザIDの有効性を表示する"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr "署名の検証時に失効したユーザID、期限切れとなったユーザIDを表示する"
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
msgid "show only the primary user ID in signature verification"
msgstr "署名の検証時に主なユーザIDだけをを表示する"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr "PKAデータで署名を検証する"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr "有効なPKAデータで署名の信用度を上昇させる"
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: 無効な検証オプションです\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
msgid "invalid verify options\n"
msgstr "無効な検証オプションです\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-pathを%sに設定不能\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: 無効な auto-key-locate リストです\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr "無効な auto-key-locate リストです\n"
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "*警告*: プログラムはcoreファイルを作成することがあります!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "*警告*: %sは%sより優先\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%sは%sとともに使うことはできません!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%sは%sとともに使っても無意味です!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr "*警告*: ニセモノのシステム時刻で実行しています: "
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "%s のため、セキュアでないメモリで実行しません\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "選択された暗号アルゴリズムは、無効です\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "選択されたダイジェスト・アルゴリズムは、無効です\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
msgid "selected compression algorithm is invalid\n"
msgstr "選択された圧縮アルゴリズムは、無効です\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "選択された証明書ダイジェスト・アルゴリズムは、無効です\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "completes-neededは正の値が必要です\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-neededは1より大きな値が必要です\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depthは1から255の範囲でなければなりません\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "無効なdefault-cert-level。0か1か2か3でなければなりません\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "無効なmin-cert-level。0か1か2か3でなければなりません\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "*注意*: 単純なS2Kモード(0)の使用には強く反対します\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "無効なS2Kモード。0か1か3でなければなりません\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "無効なデフォルトの優先指定\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "無効な個人用暗号方式の優先指定\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "無効な個人用ダイジェストの優先指定\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "無効な個人用圧縮の優先指定\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%sは%sではまだ機能しません\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "暗号アルゴリズム'%s'を%sモードで使うことはできません\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "ダイジェスト・アルゴリズム'%s'を%sモードで使うことはできません\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "圧縮アルゴリズム'%s'を%sモードで使うことはできません\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "信用データベースの初期化に失敗しました: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "*警告*: 公開鍵暗号を使わずに、受取人 (-r) を指定しています\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [ファイル名]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [ファイル名]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "'%s'の共通鍵暗号に失敗しました: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [ファイル名]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [ファイル名]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --encryptを--s2k-mode 0で使うことはできません\n"
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "--symmetric --encryptを%sモードで使うことはできません\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [ファイル名]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [ファイル名]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [ファイル名]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --sign --encryptを--s2k-mode 0で使うことはできません\n"
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "--symmetric --sign --encryptを%sモードで使うことはできません\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [ファイル名]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [ファイル名]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [ファイル名]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key ユーザid"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key ユーザid"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key ユーザid [コマンド]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
msgid "--passwd <user-id>"
msgstr "--passwd <ユーザid>"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "鍵サーバへの送信に失敗しました: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "鍵サーバからの受信に失敗しました: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "鍵のエクスポートに失敗しました: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "ssh鍵としてのエクスポートに失敗しました: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "鍵サーバの検索に失敗しました: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "鍵サーバの更新に失敗しました: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "外装除去に失敗しました: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "外装に失敗しました: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "無効なハッシュ・アルゴリズム'%s'です\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "鍵指定'%s'の構文解析エラー: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr "'%s'は有効な鍵ID, フィンガープリント、keygripではないようです。\n"
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[ファイル名]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "開始します。メッセージを打ってください ...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "あたえられた証明書ポリシーURLは無効です\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "あたえられた署名ポリシーURLは無効です\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
msgid "the given preferred keyserver URL is invalid\n"
msgstr "指定された優先鍵サーバURLは無効です\n"
@@@ -3114,135 -2378,105 +3088,133 @@@ msgstr "ヘルプはありません
msgid "No help available for '%s'"
msgstr "'%s'のヘルプはありません"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr "ローカルだけとマークされた署名をインポートします"
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr "インポートの際、にpksキーサーバからのダメージを修正します"
- #: g10/import.c:140
++#: g10/import.c:144
msgid "do not clear the ownertrust values during import"
msgstr "インポートの際、所有者信用の値をクリアしない"
- #: g10/import.c:143
++#: g10/import.c:147
msgid "do not update the trustdb after import"
msgstr "インポート後、信用データベースを更新しない"
- #: g10/import.c:146
- #, fuzzy
- #| msgid "show key fingerprint"
++#: g10/import.c:150
msgid "show key during import"
- msgstr "鍵のフィンガープリントを表示"
+ msgstr "インポートの際、鍵を表示"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr "既存の鍵に対する更新のみ認めます"
- #: g10/import.c:152
++#: g10/import.c:156
msgid "remove unusable parts from key after import"
msgstr "インポート後、利用できない部分を鍵から除去します"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr "インポート後、できるだけ除去します"
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
- msgstr ""
+ msgstr "インポート・フィルタを実行し鍵をすぐにエクスポートします"
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "型%dのブロックをスキップします\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, c-format
msgid "%lu keys processed so far\n"
msgstr "これまで%lu個の鍵を処理\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr " 処理数の合計: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " スキップしたPGP-2鍵: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " スキップした新しい鍵: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ユーザIDなし: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " インポート: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " 変更なし: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " 新しいユーザID: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " 新しい副鍵: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " 新しい署名: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " 新しい鍵の失効: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " 秘密鍵の読み込み: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " 秘密鍵のインポート: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " 無変更の秘密鍵: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " 未インポート: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " 掃除された署名: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " 掃除されたユーザID: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3251,187 -2485,149 +3223,187 @@@ msgstr "
"*警告*: 鍵%sには、これらのユーザIDに対して使用不可のアルゴリズムの優先指定が"
"あります\n"
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": 暗号アルゴリズムの優先指定 %s\n"
- #: g10/import.c:1042
++#: g10/import.c:1048
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": ダイジェスト・アルゴリズムの優先指定 %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": 圧縮アルゴリズムの優先指定 %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "あなたの優先指定を更新し、この鍵を再配布することが強く推奨されます\n"
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "それによって、潜在的なアルゴリズム不一致の問題を避けられます\n"
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "以下で、優先指定を更新できます: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, c-format
msgid "key %s: no user ID\n"
msgstr "鍵%s: ユーザIDがありません\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, c-format
msgid "key %s: %s\n"
msgstr "鍵 %s: %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr "インポートの検査で拒否されました"
- #: g10/import.c:1264
++#: g10/import.c:1343
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "鍵%s: PKSの副鍵変造を修復\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "鍵%s: 受理した未自己署名のユーザID\"%s\"\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "鍵%s: 有効なユーザIDがありません\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "これはおそらく自己署名のないせいでしょう\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "鍵%s: 公開鍵が見つかりません: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "鍵%s: 新しい鍵です - スキップします\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "書き込み可能な鍵リングが見つかりません: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "鍵リング'%s'の書き込みエラー: %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "鍵%s: 公開鍵\"%s\"をインポートしました\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "鍵%s: こちらの複製と合いません\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "鍵%s: 元の鍵ブロックに位置づけできません: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "鍵%s: 元の鍵ブロックを読み込めません: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "鍵%s: \"%s\" 新しいユーザIDを1個\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "鍵%s: \"%s\" 新しいユーザIDを%d個\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "鍵%s: \"%s\" 新しい署名を1個\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "鍵%s: \"%s\" 新しい署名を%d個\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "鍵%s: \"%s\" 新しい副鍵を1個\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "鍵%s: \"%s\" 新しい副鍵を%d個\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "鍵%s: \"%s\" %d個の署名をきれいにしました\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "鍵%s: \"%s\" %d個の署名をきれいにしました\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "鍵%s: \"%s\" %d個のユーザIDをきれいにしました\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "鍵%s: \"%s\" %d個のユーザIDをきれいにしました\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "鍵%s:\"%s\"変更なし\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, c-format
msgid "key %s: secret key imported\n"
msgstr "鍵%s: 秘密鍵をインポートしました\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "鍵 %s: 秘密鍵はもうあります\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "鍵 %s: エージェントへの送信エラー: %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, c-format
msgid "secret key %s: %s\n"
msgstr "秘密鍵 %s: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
msgid "importing secret keys not allowed\n"
msgstr "秘密鍵のインポートは禁止です\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "鍵%s: 無効な暗号方式%dの秘密鍵です - スキップします\n"
@@@ -3446,137 -2642,110 +3418,137 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr "'%s'の移行には、スマードカードそれぞれで、以下を実行してください: %s\n"
- #: g10/import.c:2133
++#: g10/import.c:2226
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "鍵%s: 公開鍵がありません - 失効証明書を適用できません\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "鍵%s: 無効な失効証明書: %s - 拒否\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "鍵%s:\"%s\"失効証明書をインポートしました\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "鍵%s: 署名に対応するユーザIDがありません\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "鍵%s: ユーザID\"%s\"のサポートしていない公開鍵アルゴリズムです\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "鍵%s: ユーザID\"%s\"の自己署名が、無効です\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "鍵%s: サポートしていない公開鍵アルゴリズムです\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "鍵%s: 無効な直接鍵署名\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "鍵%s: 鍵に対応する副鍵がありません\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "鍵%s: 無効な副鍵の対応です\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "鍵%s: 多重副鍵の対応を削除します\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "鍵%s: 鍵失効に対する副鍵がありません\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "鍵%s: 無効な副鍵失効です\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "鍵%s: 無効な副鍵の多重失効を削除します\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "鍵%s: スキップしたユーザID\"%s\"\n"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "鍵%s: スキップした副鍵\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "鍵%s: エクスポート不可な署名 (クラス0x%02X) - スキップします\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "鍵%s: 失効証明書が誤って設定されています - スキップします\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "鍵%s: 無効な失効証明書: %s - スキップします\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "鍵%s: 副鍵署名の場所が、誤っています - スキップします\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "鍵%s: 予期せぬ署名クラス (0x%02X) - スキップします\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "鍵%s: 重複したユーザIDの検出 - マージ\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "*警告*: 鍵%sは失効されたかもしれません: 失効鍵%sを取ってきます\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "*警告*: 鍵%sは失効されたかもしれません: 失効鍵%sが存在しません。\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "鍵%s:\"%s\"失効証明書の追加\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "鍵%s: 直接鍵署名を追加\n"
@@@ -3900,8 -3007,6 +3872,8 @@@ msgstr "この鍵は、かなり注意�
msgid "Really sign? (y/N) "
msgstr "本当に署名しますか? (y/N) "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "署名に失敗しました: %s\n"
@@@ -4226,13 -3255,10 +4198,12 @@@ msgstr "更新に失敗しました: %s
msgid "Key not changed so no update needed.\n"
msgstr "鍵は無変更なので更新は不要です。\n"
+#: g10/keyedit.c:3025
- #, fuzzy, c-format
- #| msgid "Key generation failed: %s\n"
+ #, c-format
msgid "User ID revocation failed: %s\n"
- msgstr "鍵の生成に失敗しました: %s\n"
+ msgstr "ユーザIDの失効に失敗しました: %s\n"
+#: g10/keyedit.c:3070
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\"はフィンガープリントではありません\n"
@@@ -4345,13 -3347,9 +4316,13 @@@ msgstr "
"プログラムを再起動するまで、表示された鍵の有効性は正しくないかもしれない、\n"
"ということを念頭においてください。\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
msgid "revoked"
msgstr "失効"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "期限切れ"
@@@ -4617,12 -3559,10 +4588,12 @@@ msgstr "失効証明書を本当に作�
msgid "no secret key\n"
msgstr "秘密鍵がありません\n"
+#: g10/keyedit.c:6230
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
- msgstr ""
+ msgstr "ユーザIDでないものを失効しようとしました: %s\n"
+#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ユーザID\"%s\"は、もう失効されています\n"
@@@ -5256,30 -4076,25 +5227,30 @@@ msgstr " フィンガープリント
msgid " Card serial no. ="
msgstr " カードシリアル番号 ="
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, c-format
msgid "caching keyring '%s'\n"
msgstr "鍵リング'%s'をキャッシュします\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "これまで%lu個の鍵をキャッシュしました (%lu個の署名)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] "%lu個の鍵をキャッシュしました"
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, c-format
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
msgstr[0] " (%lu個の不正な署名)\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: 鍵リングができました\n"
@@@ -5489,114 -4259,95 +5460,120 @@@ msgstr "スタンドアロン失効 - \
msgid "no signature found\n"
msgstr "署名が見つかりません\n"
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, c-format
msgid "BAD signature from \"%s\""
msgstr "\"%s\"からの*不正な*署名"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, c-format
msgid "Expired signature from \"%s\""
msgstr "\"%s\"からの期限切れの署名"
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, c-format
msgid "Good signature from \"%s\""
msgstr "\"%s\"からの正しい署名"
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "署名の検証を省略\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
msgid "can't handle this ambiguous signature data\n"
msgstr "このあいまいな署名データは取り扱えません\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, c-format
msgid "Signature made %s\n"
msgstr "%sに施された署名\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, c-format
msgid " using %s key %s\n"
msgstr " %s鍵%sを使用\n"
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "%sに%s鍵ID %sで施された署名\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ #| msgid " aka \"%s\""
+ msgid " issuer \"%s\"\n"
+ msgstr " 別名\"%s\""
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "以下に鍵があります: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[不確定]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, c-format
msgid " aka \"%s\""
msgstr " 別名\"%s\""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "期限切れの署名 %s\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "この署名は%sで期限切れとなります\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s署名、ダイジェスト・アルゴリズム %s%s%s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "バイナリ"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "テキストモード"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "不明の"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
msgid ", key algorithm "
msgstr "、鍵アルゴリズム "
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
"*警告*: 分遣署名ではありません。ファイル「%s」は検証され*ませんでした*!\n"
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "署名を検査できません: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "分遣署名でありません\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "*警告*: 多重署名の検出。最初のものだけ検査します。\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "クラス0x%02xのスタンドアロン署名\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "古い形式 (PGP 2.x) の署名\n"
@@@ -5772,84 -4488,39 +5749,50 @@@ msgstr "*警告*: 潜在的にセキュ
msgid "subpacket of type %d has critical bit set\n"
msgstr "型%dの下位パケットにクリティカル・ビットを発見\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, c-format
msgid "problem with the agent: %s\n"
msgstr "エージェントに問題: %s\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, c-format
- msgid " (main key ID %s)"
- msgstr " (主鍵ID %s)"
-
- #: g10/passphrase.c:277
- #, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "OpenPGP証明書の秘密鍵のロックを解除するためにパスフレーズを入力してくださ"
- "い:\n"
- "\"%.*s\"\n"
- "%uビット %s 鍵, ID %s,\n"
- "作成日付 %s%s。\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "パスフレーズを入力\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "ユーザによる取消し\n"
- #: g10/passphrase.c:483
++#: g10/passphrase.c:489
#, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "次のユーザの秘密鍵のロックを解除するには\n"
- "パスフレーズがいります:\"%s\"\n"
-
- #: g10/passphrase.c:491
- #, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%uビット%s鍵, ID %s作成日付は%s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr " (主鍵ID %s の副鍵)"
+ msgid " (main key ID %s)"
+ msgstr " (主鍵ID %s)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "OpenPGPの秘密鍵のロックを解除するためにパスフレーズを入力してください:"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "OpenPGPの秘密鍵をインポートするためにパスフレーズを入力してください:"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr ""
"OpenPGPの秘密副鍵をエクスポートするためにパスフレーズを入力してください:"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "OpenPGPの秘密鍵をエクスポートするためにパスフレーズを入力してください:"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "選択したOpenPGP副鍵を本当に永久に削除しますか? (y/N) "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "選択したOpenPGP秘密鍵を本当に永久に削除しますか? (y/N) "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, c-format
msgid ""
"%s\n"
@@@ -6044,122 -4680,95 +5987,122 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "それでもこの鍵を使いますか? (y/N) "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "*警告*: 信用できない鍵を使っています!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "*警告*: この鍵は失効されたようです (失効鍵は不在)\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "*警告*: この鍵は指名失効者によって失効されています!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "*警告*: この鍵は所有者によって失効されています!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
msgid " This could mean that the signature is forged.\n"
msgstr " 署名が偽物なこともある、ということです。\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "*警告*: この副鍵は所有者によって失効されています!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "注意: この鍵は使用禁止に設定されています。\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "注意: 確認された署名者のアドレスは'%s'です\n"
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "注意: 署名者のアドレス'%s'がDNSのエントリと一致しません\n"
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "PKA情報が有効のため、信用レベルがFULLに調整されました\n"
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "PKA情報が無効のため、信用レベルがNEVERに調整されました\n"
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "注意: この鍵は期限切れです!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "*警告*: この鍵は信用できる署名で証明されていません!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " この署名が所有者のものかどうかの検証手段がありません。\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "*警告*: この鍵は信用できません!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " この署名はおそらく 偽物 です。\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "*警告*: この鍵は十分に信用できる署名で証明されていません!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " この署名が所有者のものかどうか確信できません。\n"
- #: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: スキップ: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: スキップ: 公開鍵は使用禁止です\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: スキップ: 公開鍵はもうあります\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, c-format
msgid "can't encrypt to '%s'\n"
msgstr "'%s'に暗号化できません\n"
- #: g10/pkclist.c:984
++#: g10/pkclist.c:988
#, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr ""
"オプション'%s'が与えられましたが、有効なデフォルト鍵が与えられていません\n"
- #: g10/pkclist.c:991
++#: g10/pkclist.c:995
#, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "オプション'%s'が与えられましたが、オプション'%s'は与えられていません\n"
- #: g10/pkclist.c:1094
++#: g10/pkclist.c:1098
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "ユーザIDを指定していません (\"-r\"を使いましょう) 。\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr "今の受取人:\n"
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6167,37 -4776,29 +6110,37 @@@ msgstr "
"\n"
"ユーザIDを入力。空行で終了: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "そのユーザIDはありません。\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
msgid "skipped: public key already set as default recipient\n"
msgstr "スキップ: 公開鍵はデフォルトの受取人としてもう設定済みです\n"
- #: g10/pkclist.c:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "公開鍵は使用禁止です。\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "スキップ: 公開鍵はもう設定済みです\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "デフォルトの受取人\"%s\"が不明です\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "有効な宛先がありません\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "注意: 鍵%sには %s の機能がありません\n"
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "注意: 鍵%sには%sに対する優先指定がありません\n"
@@@ -6476,7 -5025,6 +6419,7 @@@ msgid "public key %s is %lu day newer t
msgid_plural "public key %s is %lu days newer than the signature\n"
msgstr[0] "公開鍵%sは、署名よりも%lu日、新しいものです\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6534,12 -5073,10 +6477,12 @@@ msgid "
"unexpanded.\n"
msgstr "*警告*: 優先鍵サーバURLを%%拡張不能 (大きすぎ)。拡張せずに使用。\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s署名。署名者:\"%s\"\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6547,11 -5084,9 +6490,11 @@@ msgstr "
"*警告*: ダイジェスト・アルゴリズム %s (%d) の強制が、受取人の優先指定と対立し"
"ます\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "署名:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s暗号化を使用します\n"
@@@ -6654,7 -5169,6 +6597,7 @@@ msgstr "信用データベースのト�
msgid "%s: directory does not exist!\n"
msgstr "%s: ディレクトリがありません!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, c-format
msgid "can't access '%s': %s\n"
msgstr "'%s'にアクセスできません: %s\n"
@@@ -6763,66 -5255,46 +6706,58 @@@ msgstr "%d文字以上の長さのテ�
msgid "input line longer than %d characters\n"
msgstr "入力行の長さが%d文字を超えています\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "TOFUデータベースのトランザクション開始エラー: %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr "TOFUデータベースのトランザクションコミットのエラー: %s\n"
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr "TOFUデータベースのトランザクションのロールバックのエラー: %s\n"
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr "サポートされていないTOFUデータベースバージョン: %s\n"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "TOFUデータベースの読み込みエラー: %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, c-format
msgid "error determining TOFU database's version: %s\n"
msgstr "TOFUデータベースのバージョン判定エラー: %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, c-format
msgid "error initializing TOFU database: %s\n"
msgstr "TOFUデータベースの初期化エラー: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "TOFUデータベースのオープンでエラー '%s': %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr "警告: tofu.db と tofu.d の両方がホームディレクトリにあります。\n"
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr "TOFUデータベースに分割フォーマットを使用\n"
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "TOFUデータベースの更新エラー: %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr "%sのバインディングは不明です。"
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
@@@ -6831,7 -5303,6 +6766,7 @@@ msgstr "
"鍵のフィンガープリント%sがバインディング%sと衝突しました。このバインディング"
"ポリシーは'auto'だったので、'ask'に変更されました。"
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
@@@ -6840,65 -5311,53 +6775,65 @@@ msgstr "
"バインディング%s%sが適切(鍵は述べられた所有者に属する)か、偽られたものか(ダ"
"メ)かを指示してください。"
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "ほかのユーザIDの収集エラー: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr "この鍵に結びつけられた知られているユーザID:\n"
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, c-format
msgid "policy: %s"
msgstr "ポリシー: %s"
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, c-format
msgid "error gathering signature stats: %s\n"
msgstr "署名の統計の収集エラー: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] "電子メールアドレス\"%s\"は%d個の鍵に結びつけられます:\n"
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "この電子メールアドレス\"%s\"の鍵の統計:\n"
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
msgid "this key"
msgstr "この鍵"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] "%ld個のメッセージが未来に署名されました。"
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "%ld個のメッセージに署名しました"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] "過去%ld日に。"
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] "過去%ld週間に。"
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -6907,77 -5366,64 +6842,77 @@@ msgstr[0] "過去%ld月に。
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr "TOFUはバインディングの衝突を検出しました"
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr "gGaAuUrRbB"
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
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:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "TOFUデータベースの信用レベルの設定エラー: %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "TOFUポリシーの作成エラー: %s\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] "%d~年"
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] "%d~月"
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] "%d~月"
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] "%d~時間"
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] "%d~分"
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] "%d~秒"
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr "鍵%sで署名されたメッセージを検証したことは一度もありません!\n"
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
@@@ -6986,12 -5432,10 +6921,12 @@@ msgstr "
"\"%s\"の署名の統計を収集することに失敗しました\n"
"(鍵 %s)\n"
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, c-format
msgid "Verified %ld messages signed by \"%s\"."
msgstr "%ld個のメッセージを検証しました(\"%s\"で署名されたもの)。"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7001,21 -5445,17 +6936,21 @@@ msgid_plural "
"in the past %s."
msgstr[0] "メッセージを%ld回検証しました(\"%s\"で署名されたもの。かつて %s)。"
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr "もっとも最近のメッセージは%s前に検証されました。"
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr "警告: この鍵で署名されたメッセージを検証したことはありません!\n"
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
"警告: この鍵で署名されたメッセージを検証したことは一度しかありません!\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7036,8 -5476,6 +6971,7 @@@ msgstr[0] "
" %s\n"
"でダメとマークしてください。\n"
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "TOFUデータベースのオープンでエラー: %s\n"
@@@ -7553,7 -5882,6 +7487,7 @@@ msgstr "|N|初期の新しいPIN
msgid "run in multi server mode (foreground)"
msgstr "マルチ・サーバ・モード(フォアグラウンド)で実行"
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|デバッグ・レベルをLEVELとします"
@@@ -7605,18 -5922,15 +7539,18 @@@ msgstr "
"形式: scdaemon [オプション] [コマンド [引数]]\n"
"@GNUPG@のSmartcardデーモン\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
"'--daemon'オプションを使って、プログラムをバックグラウンドで実行してくださ"
"い\n"
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr "fd %dのハンドラが開始されました\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "fd %dのハンドラが終了しました\n"
@@@ -7715,12 -6006,10 +7649,12 @@@ msgstr "\"dirmngr\" が正しくイン�
msgid "checking the CRL failed: %s"
msgstr "CRLの検査に失敗しました: %s"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr "無効の妥当性の証明書: %s"
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr "証明書はまだ有効ではありません"
@@@ -7732,7 -6019,6 +7666,7 @@@ msgstr "ルート証明書がまだ有�
msgid "intermediate certificate not yet valid"
msgstr "中間証明書はまだ有効ではありません"
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
msgid "certificate has expired"
msgstr "証明書が有効期限を過ぎています"
@@@ -7781,7 -6056,6 +7715,7 @@@ msgstr " ( 証明書、有効
msgid " ( issuer valid from "
msgstr " ( 発行者、有効"
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, c-format
msgid "fingerprint=%s\n"
msgstr "フィンガープリント=%s\n"
@@@ -7813,7 -6081,6 +7747,7 @@@ msgstr "証明書の発行者があり�
msgid "self-signed certificate has a BAD signature"
msgstr "自己署名証明書に*不正な*署名があります"
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr "ルート証明書が信用できるとマークされていません"
@@@ -7822,28 -6088,22 +7756,28 @@@
msgid "checking the trust list failed: %s\n"
msgstr "信用リストの検査に失敗しました: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr "証明書のチェインが長すぎます\n"
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr "発行者証明書が見つかりません"
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
msgid "certificate has a BAD signature"
msgstr "証明書に*不正な*署名があります"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr "別の一致する可能性があるCA証明書が見つかりました - 再度試します"
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr "証明書のチェインがCAにより認められたもの(%d)より長くなっています"
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
msgid "certificate is good\n"
msgstr "証明書は正しいです\n"
@@@ -7873,7 -6127,6 +7807,7 @@@ msgstr "%uビットハッシュは%uビ
msgid "(this is the MD2 algorithm)\n"
msgstr "(これはMD2アルゴリズムです)\n"
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
msgid "none"
msgstr "none"
@@@ -7908,36 -6156,28 +7842,36 @@@ msgstr "
"S/N %s, ID 0x%08lX,\n"
"作成 %s, 有効期限 %s.\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr "鍵の使い方が指定されていません - すべての使い道を仮定します\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "鍵使用情報の取得エラー: %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr "証明書は証明のために使われるべきではありませんでした\n"
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr "証明書はOCSP応答の署名のために使われるべきではありませんでした\n"
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr "証明書は暗号化のために使われるべきではありませんでした\n"
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr "証明書は署名のために使われるべきではありませんでした\n"
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr "証明書は暗号化のために使えません\n"
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr "証明書は署名のために使えません\n"
@@@ -8355,21 -6505,17 +8289,21 @@@ msgstr "%s:%u: ユーザなしに与え
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: この行はスキップ\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
msgid "could not parse keyserver\n"
msgstr "鍵サーバのURLを解析不能\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "共通証明書のインポート・エラー: %s\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "'%s'を用いて署名できません: %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr "無効なコマンド (暗黙のコマンドはありません)\n"
@@@ -8430,7 -6564,6 +8364,7 @@@ msgstr "証明書の再検索の問題
msgid "error storing flags: %s\n"
msgstr "フラグの保存エラー: %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr "エラー - "
@@@ -8557,93 -6669,69 +8491,88 @@@ msgstr "証明書キャッシュのロ�
msgid "dropping %u certificates from the cache\n"
msgstr "%uの証明書をキャッシュからはずします\n"
- #: dirmngr/certcache.c:352
- #, c-format
- msgid "can't access directory '%s': %s\n"
- msgstr "ディレクトリ'%s'が作成できません: %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, c-format
msgid "can't parse certificate '%s': %s\n"
msgstr "証明書'%s'が解析できません: %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, c-format
msgid "certificate '%s' already cached\n"
msgstr "証明書'%s'はすでにキャッシュされています\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "信用される証明書'%s'をロードしました\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, c-format
msgid "certificate '%s' loaded\n"
msgstr "証明書'%s'をロードしました\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr " SHA1フィンガープリント = %s\n"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr " 発行者 ="
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr "サブジェクト ="
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "証明書'%s'の読み込みエラー: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, c-format
msgid "permanently loaded certificates: %u\n"
msgstr "永続的にロードされる証明書: %u\n"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, c-format
msgid " runtime cached certificates: %u\n"
msgstr "実行時キャッシュ証明書の数: %u\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
msgid "certificate already cached\n"
msgstr " すでにキャッシュされた証明書\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
msgid "certificate cached\n"
msgstr "キャッシュされた証明書\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, c-format
msgid "error caching certificate: %s\n"
msgstr "証明書のキャッシュのエラー: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "無効なSHA1フィンガープリント文字列'%s'\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "S/Nでの証明書取得エラー : %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "サブジェクトでの証明書取得エラー: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
msgid "no issuer found in certificate\n"
msgstr "証明書に発行者がみつかりません\n"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "authorityKeyIdentifierの取得エラー: %s\n"
@@@ -8900,7 -6937,6 +8829,7 @@@ msgstr "S/N %sは有効です。CRLに�
msgid "error getting data from cache file: %s\n"
msgstr "キャッシュ・ファイルからデータの取得エラー: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, c-format
msgid "unknown hash algorithm '%s'\n"
msgstr "不明なハッシュ・アルゴリズム'%s'\n"
@@@ -8919,7 -6952,6 +8848,7 @@@ msgstr "libksbaから無効なS-式を�
msgid "converting S-expression failed: %s\n"
msgstr "S式の変換に失敗しました: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, c-format
msgid "creating S-expression failed: %s\n"
msgstr "S式の作成に失敗しました: %s\n"
@@@ -9299,112 -7251,81 +9228,108 @@@ msgstr "絶対ファイル名がきま�
msgid "looking up '%s'\n"
msgstr "'%s'を検索します\n"
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr "ウィンドウズ・サービスとして実行 (バックグラウンド)"
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr "CRLキャッシュの内容をリストします"
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|FILEからCRLをキャッシュにロードする"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|URLからCRLを取得します"
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr "dirmngrをシャットダウンする"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr "キャッシュをフラッシュします"
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr "|FILE|FILEにサーバ・モードのログを書き出す"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
msgid "run without asking a user"
msgstr "ユーザに問い合わせせずに実行"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr "期日の過ぎたCRLのロードを強制する"
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr "OCSP要求の送信を認める"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr "HTTPの使用を禁止する"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr "LDAPの使用を禁止する"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr "HTTP CRL配布ポイントを無視する"
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr "LDAP CRL配布ポイントを無視する"
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr "OCSPサービスURLに入っている証明書を無視する"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|すべてのHTTPリクエストをURLにリダイレクトする"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HOST|LDAPの問い合わせにHOSTを使う"
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "--ldap-proxy にフォールバック・ホストを使わない"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|FILEからLDAPサーバリストを読み込みます"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr "CRL配布ポイントに発見された新しいサーバを serverlist に追加する"
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|LDAPのタイムアウトをN秒とする"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|OCSP応答としてURLを使用"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|FPRで署名されたOCSPレスポンス"
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr "|N|一つのクエリでNを越えるのアイテムを返さない"
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr "|FILE|FILEにあるCA証明書をTLSでのHKPに使う"
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr "ネットワーク・トラフィックをすべてTor経由にする"
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9413,11 -7334,9 +9338,11 @@@ msgstr "
"@\n"
"(コマンドとオプション全部の一覧は、\"info\" マニュアルをご覧ください)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "使い方: @DIRMNGR@ [オプション] (ヘルプは -h)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9425,77 -7344,60 +9350,77 @@@ msgstr "
"形式: @DIRMNGR@ [オプション] [コマンド [引数]]\n"
"@GnuPG@の鍵サーバ、CRLとOCSPアクセス\n"
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "有効なdebugレベルは: %s\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, c-format
msgid "usage: %s [options] "
msgstr "使い方: %s [オプション] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
msgid "colons are not allowed in the socket name\n"
msgstr "コロンはソケット名に許されません\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "'%s'からCRLの取得の失敗: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "'%s'からCRLの処理に失敗: %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: 行が長すぎます - スキップされました\n"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: 無効なフィンガープリントが検出されました\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: 読み込みエラー: %s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: 行末のゴミを無視\n"
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr "SIGHUPを受け取り - 設定を読み直し、キャッシュをフラッシュ\n"
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr "SIGUSR2を受け取り - 動作は定義されない\n"
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr "SIGTERMを受け取り - シャットダウン...\n"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "SIGTERMを受け取り - %d本のアクティブな接続がまだあります\n"
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
msgid "shutdown forced\n"
msgstr "強制的にシャットダウンする\n"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr "SIGINTを受け取り - すぐにシャットダウン\n"
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "シグナル%dを受け取り - アクションは定義されない\n"
@@@ -9825,98 -7657,77 +9750,98 @@@ msgstr "'%s'に対するOCSP応答の�
msgid "not signed by a default OCSP signer's certificate"
msgstr "デフォルトOCSP署名者の証明で署名されていません"
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr "SHA-1だけがOCSPレスポンスとしてサポートされています\n"
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, c-format
msgid "allocating list item failed: %s\n"
msgstr "リスト項目の確保に失敗しました: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, c-format
msgid "error getting responder ID: %s\n"
msgstr "応答IDの取得エラー: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr "OCSP応答を検証する適切な証明書がありませんでした\n"
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, c-format
msgid "issuer certificate not found: %s\n"
msgstr "発行者証明書が見つかりません: %s\n"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr "呼出側が対象の証明書を返しませんでした\n"
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
msgid "caller did not return the issuing certificate\n"
msgstr "呼出側が発行される証明書を返しませんでした\n"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "OCSPコンテクストの確保に失敗しました: %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, c-format
msgid "can't get authorityInfoAccess: %s\n"
msgstr "authorityInfoAccessを取得できません: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr "デフォルトOCSPレスポンダが定義されていません\n"
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
msgid "no default OCSP signer defined\n"
msgstr "デフォルトのOCSP署名者が定義されていません\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr "デフォルトOCSP応答'%s'を使います\n"
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, c-format
msgid "using OCSP responder '%s'\n"
msgstr "OCSP応答'%s'を使います\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr "OCSPのハッシュ・コンテクストを確立するのに失敗しました: %s\n"
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "対象の証明書のOCSPステイタスの取得エラー: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr "証明書ステイタスは: %s (これ=%s 次=%s)\n"
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr "良好"
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "証明書は失効済みです: %s (理由: %s)\n"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr "OSCPレスポンダは未来のステイタスを返しました\n"
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr "OSCPレスポンダは現在でないステイタスを返しました\n"
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr "OSCPレスポンダは古すぎるステイタスを返しました\n"
@@@ -9964,32 -7765,26 +9889,32 @@@ msgstr "fetch_next_cert が失敗しま
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d を越えました\n"
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "制御構造を確保できません: %s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "assuanコンテクストの確保に失敗しました: %s\n"
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "サーバの初期化に失敗しました: %s\n"
- #: dirmngr/server.c:2444
++#: dirmngr/server.c:2406
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "Assuanで登録コマンドに失敗しました: %s\n"
- #: dirmngr/server.c:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan accept の問題: %s\n"
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuanの処理が失敗しました: %s\n"
@@@ -10010,32 -7801,22 +9935,28 @@@ msgstr "CRL を確認しません
msgid "checking CRL for"
msgstr "CRLの検査をしています"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr "コンパチ・モードで実行します - 証明書チェインは確認しません!\n"
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
msgid "selfsigned certificate has a BAD signature"
msgstr "自己署名証明書に*不正な*署名があります"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "ルート証明書の信用検査に失敗しました: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
msgid "certificate chain is good\n"
msgstr "証明書チェインは正しいです\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSAは160ビットののハッシュアルゴリズムの使用を必要とします\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr "証明書はCRL署名のために使われるべきではありませんでした\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
msgid "quiet"
msgstr "おとなしく"
@@@ -10161,11 -7911,9 +10082,11 @@@ msgstr "|N|最大SSH鍵存続時間をN
msgid "Options enforcing a passphrase policy"
msgstr "パスワード・ポリシーの強制オプション"
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr "パスワード・ポリシーを迂回することを認めない"
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|新しいパスフレーズの必要とする最低長をNとする"
@@@ -10299,67 -8015,51 +10220,67 @@@ msgstr "コンポーネント%sの外�
msgid "Note that group specifications are ignored\n"
msgstr "グループ仕様は無視されていることに注意してください\n"
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr "すべてのコンポーネントをリストする"
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr "すべてのプログラムをチェックする"
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr "|COMPONENT|オプションをリストする"
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr "|COMPONENT|オプションを変更する"
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr "|COMPONENT|オプションをチェックする"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr "グローバル・デフォルト値を適用する"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr "@GPGCONF@のためにコンフィグレーション・ディレクトリを取得する"
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
msgid "list global configuration file"
msgstr "グローバルのコンフィグレーション・ファイルをリストする"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
msgid "check global configuration file"
msgstr "グローバルのコンフィグレーション・ファイルをチェックする"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr "すべて、あるいは指定されたコンポーネントをリロードする"
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr "指定されたコンポーネントを起動する"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr "指定されたコンポーネントをkillする"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "出力ファイルとして使用"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr "可能な場合、実行時に変更を有効とする"
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "使い方: @GPGCONF@ [オプション] (ヘルプは -h)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10367,15 -8067,12 +10288,15 @@@ msgstr "
"形式: @GPGCONF@ [オプション]\n"
"@GNUPG@システムのツールに対しコンフィグレーション・オプションを管理する\n"
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr "一つコンポーネント引数が必要です"
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
msgid "Component not found"
msgstr "コンポーネントが見つかりません"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
msgid "No argument allowed"
msgstr "引数は許可されていません"
@@@ -10427,122 -8115,97 +10348,122 @@@ msgstr "
"ン...] COMMAND [入力ファイル]\n"
"シンプルな共通鍵暗号ツールを呼び出す\n"
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s (%s の)がステイタス%iで中止されました\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, c-format
msgid "%s on %s failed with status %i\n"
msgstr "%s (%s の)がステイタス%iで失敗しました\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "一時ディレクトリ'%s'が作成できません: %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr "%sを書き込みでオープンできませんでした: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, c-format
msgid "error writing to %s: %s\n"
msgstr "'%s'の書き込みエラー: %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, c-format
msgid "error reading from %s: %s\n"
msgstr "'%s'の読み込みエラー: %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, c-format
msgid "error closing %s: %s\n"
msgstr "'%s'でクローズのエラー: %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
msgid "no --program option provided\n"
msgstr "--programオプションが指定されていません\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr "--decryptと--encryptだけがサポートされています\n"
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr "--keyfileオプションが与えられていません\n"
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr "引数ベクタが確保できません\n"
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, c-format
msgid "could not create pipe: %s\n"
msgstr "パイプが作成できませんでした: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, c-format
msgid "could not create pty: %s\n"
msgstr "ptyが作成できませんでした: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr "fork できませんでした: %s\n"
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, c-format
msgid "execv failed: %s\n"
msgstr "execv が失敗しました: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, c-format
msgid "select failed: %s\n"
msgstr "select が失敗しました: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, c-format
msgid "read failed: %s\n"
msgstr "read が失敗しました: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, c-format
msgid "pty read failed: %s\n"
msgstr "pty read が失敗しました: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, c-format
msgid "waitpid failed: %s\n"
msgstr "waitpid が失敗しました: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr "子プロセスがステイタス %i で中止されました\n"
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "infileの文字列が確保できません: %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "outfileの文字列を確保できません: %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr "%s か %s のどちらかが与えられる必要があります\n"
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr "クラスが与えられていません\n"
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, c-format
msgid "class %s is not supported\n"
msgstr "クラス%sはサポートされていません\n"
diff --cc po/nb.po
index f5df2e1,4e5bc40..af4f461
--- a/po/nb.po
+++ b/po/nb.po
@@@ -9,11 -9,10 +9,11 @@@
#
msgid ""
msgstr ""
- "Project-Id-Version: GNU gnupg 2.1.13\n"
+ "Project-Id-Version: GNU gnupg 2.1.14\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
- "PO-Revision-Date: 2016-07-09 22:31+0100\n"
- "Last-Translator: Åka Sikrom <a4 at hush.com>\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
+ "PO-Revision-Date: 2016-07-15 10:27+0100\n"
+ "Last-Translator: Åka Sikrom <a4 æt hush dåt com>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
"Language: nb\n"
"MIME-Version: 1.0\n"
@@@ -107,13 -91,9 +107,13 @@@ msgstr "
msgid "PIN:"
msgstr "PIN:"
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
msgid "Passphrase:"
msgstr "Passordfrase:"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr "feil. Prøv igjen"
@@@ -153,64 -125,42 +153,64 @@@ msgstr "Ugyldig PIN
msgid "Bad Passphrase"
msgstr "Ugyldig passordfrase"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh-nøkler som er lenger enn %d bit støttes ikke\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, c-format
msgid "can't create '%s': %s\n"
msgstr "klarte ikke å lage «%s»: %s\n"
- #: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, c-format
msgid "can't open '%s': %s\n"
msgstr "klarte ikke å åpne «%s»: %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "feil under henting av kort-serienummer: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "oppdaget kort med serienummer %s\n"
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "ingen ssh-autentiseringnøkkel på kort: %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "fant ingen passende kortnøkkel: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, c-format
msgid "shadowing the key failed: %s\n"
msgstr "skyggelegging av nøkkel mislyktes: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, c-format
msgid "error writing key: %s\n"
msgstr "feil under skriving av nøkkel: %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -219,24 -169,19 +219,24 @@@ msgstr "
"En ssh-prosess ber om tillatelse til å brukt nøkkel%%0A %s%%0A (%s)%%0AVil "
"du tillate dette?"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr "Tillat"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr "Avvis"
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Skriv inn passordfrase for ssh-nøkkel%%0A %F%%0A (%c)"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Skriv inn denne passordfrasen på nytt"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -245,7 -190,6 +245,7 @@@ msgstr "
"Skriv inn passordfrase som skal brukes til å beskytte mottatt hemmelig nøkkel"
"%%0A %s%%0A %s%%0Ai nøkkellageret for gpg-agent"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "klarte ikke å lage strøm av sokkel: %s\n"
@@@ -377,8 -295,6 +377,8 @@@ msgstr "Skriv inn passordfrase for å%0
msgid "Please enter the new passphrase"
msgstr "Skriv inn ny passordfrase"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -386,128 -302,90 +386,128 @@@ msgstr "
"@Valg:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr "kjør som bakgrunnsprosess («daemon»)"
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr "kjør i tjenermodus (forgrunn)"
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detaljert utskrift"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "være noenlunde stille"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr "sh-utdata for kommandoer"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr "csh-utdata for kommandoer"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FIL|les valg fra valgt FIL"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr "ikke løsne fra konsoll"
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr "ikke bruk tastatur og mus"
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "bruk loggfil for tjeneren"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|bruk PGM til inntasting av PIN-koder"
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|bruk PGN som SCdaemon-program"
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
msgid "do not use the SCdaemon"
msgstr "ikke bruk SCdaemon"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|godta enkelte kommandoer via «NAME»"
- #: agent/gpg-agent.c:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr "ignorer forespørsler om å bytte TTY"
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr "ignorer forespørsler om å bytte X-skjerm"
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|fjern hurtiglagrede PIN-koder etter N sekunder"
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr "ikke bruk PIN-hurtiglager under signering"
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
msgid "disallow the use of an external password cache"
msgstr "ikke tillat bruk av eksternt passord-hurtiglager"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr "ikke la klienter tillitsmarkere nøkler"
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
msgid "allow presetting passphrase"
msgstr "tillat valg av passordfrase på forhånd"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr "ikke la kaller overstyre PIN-inntasting"
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr "la brukeren skrive inn passordfrase via Emacs"
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
msgid "enable ssh support"
msgstr "slå på ssh-støtte"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Rapporter programfeil til <@EMAIL@>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Bruk: @GPG_AGENT@ [valg] («-h» for hjelp)"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -515,107 -393,72 +515,99 @@@ msgstr "
"Syntaks: @GPG_AGENT@ [valg] [kommando [arg]]\n"
"Håndtering av hemmelige nøkler for @GNUPG@\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "«%s» er et ugyldig feilsøkingsnivå\n"
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr "%s er for gammel (krever %s, har %s)\n"
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "Merk: standardvalg-fil «%s» finnes ikke\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, c-format
msgid "option file '%s': %s\n"
msgstr "valgfil «%s»: %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, c-format
msgid "reading options from '%s'\n"
msgstr "leser valg fra «%s»\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Merk: «%s» regnes ikke som et valg\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, c-format
msgid "can't create socket: %s\n"
msgstr "klarte ikke å lage sokkel: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "sokkelnavnet «%s» er for langt\n"
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
msgid "error getting nonce for the socket\n"
msgstr "feil under henting av sokkel-anledning\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "feil under knytning av sokkel til «%s»: %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "klarte ikke å endre tillatelser til «%s»: %s\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() mislyktes: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, c-format
msgid "listening on socket '%s'\n"
msgstr "lytter på sokkel «%s»\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "klarte ikke å lage mappa «%s»: %s\n"
- #: agent/gpg-agent.c:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "mappa «%s» er opprettet\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "stat() mislyktes for «%s»: %s\n"
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "«%s» kan ikke brukes som hjemmemappe\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "feil under lesing av anledning på fd %d: %s\n"
@@@ -630,28 -471,22 +622,28 @@@ msgstr "startet behandler 0x%lx for fd
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "avsluttet behandler 0x%lx for fd %d\n"
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, 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:2390
++#: agent/gpg-agent.c:2392
#, 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:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_pselect mislyktes: %s - venter 1s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppet\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "ingen gpg-agent kjører i gjeldende økt\n"
@@@ -667,8 -500,6 +659,8 @@@ msgstr "
"Syntaks: gpg-preset-passphrase [valg] KEYGRIP\n"
"Vedlikehold av hurtiglager for passord\n"
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -676,9 -507,6 +668,9 @@@ msgstr "
"@Kommandoer:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -700,39 -526,32 +692,39 @@@ msgstr "
"Syntaks: gpg-protect-tool [valg] [arg]\n"
"Håndteringsverktøy for hemmelige nøkler\n"
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Skriv inn passordfrase for å låse opp PKCS#12-objekt."
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Skriv inn passordfrase for å låse nytt PKCS#12-objekt."
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
"Skriv inn passordfrase for å låse nytt importert objekt i GnuPG-systemet."
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr ""
"Skriv inn passordfrase eller PIN-kode som\n"
- "\vkreves for å fullføre gjeldende handling."
+ "kreves for å fullføre gjeldende handling."
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
msgid "cancelled\n"
msgstr "avbrutt\n"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, c-format
msgid "error opening '%s': %s\n"
msgstr "feil under åpning av «%s»: %s\n"
@@@ -881,12 -676,10 +873,12 @@@ msgstr "%s nøkkel bruker utrygg kontro
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
msgstr "kontrollsum på %zu bit er ugyldig for %u-bits %s-nøkler\n"
+#: agent/pksign.c:512
#, c-format
msgid "checking created signature failed: %s\n"
- msgstr "kontroll av opprettet signatur mislyktes. %s\n"
+ msgstr "kontroll av opprettet signatur mislyktes: %s\n"
+#: agent/cvt-openpgp.c:338
msgid "secret key parts are not available\n"
msgstr "hemmelige nøkkeldeler er ikke tilgjenglig\n"
@@@ -905,84 -695,50 +897,67 @@@ msgstr "beskyttelsesalgoritme %d (%s) s
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "kontrollsum-algoritme for beskyttelse %d (%s) støttes ikke\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "feil under opprettelse av datarør: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "feil under opprettelse av strøm for datarør: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, c-format
msgid "error forking process: %s\n"
msgstr "feil under kopiering av prosess: %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "venting på avslutning av prosesser mislyktes: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr ""
"feil under kjøring av «%s». Programmet er sannsynligvis ikke installert\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "feil under kjøring av «%s». Avslutningskode %d\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, c-format
msgid "error running '%s': terminated\n"
msgstr "feil under kjøring av «%s». Avsluttet\n"
+#: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
#, c-format
msgid "error getting exit code of process %d: %s\n"
- msgstr "feil under henting av avslutningskode for prosess %d: %s\n"
+ msgstr "feil under henting av prosess-avslutningskode %d: %s\n"
+#: common/exechelp-w32ce.c:767
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "prosessen %d avsluttet ikke i tide. %s\n"
+ msgstr "prosess %d avsluttet ikke i tide: %s\n"
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "klarte ikke å koble til «%s»: %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "kommunikasjonsproblemer med gpg-agent\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
msgid "problem setting the gpg-agent options\n"
msgstr "klarte ikke å sette opp valg for gpg-agent\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- msgid "canceled by user\n"
- msgstr "avbrutt av bruker\n"
-
- #: common/simple-pwquery.c:579
- msgid "problem with the agent\n"
- msgstr "problemer med agent\n"
-
- #: common/simple-pwquery.c:701
- #, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "problemer med agent (uventet svar: «%s»)\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "klarte ikke å slå av kjernedump: %s\n"
@@@ -1052,12 -794,10 +1027,12 @@@ msgstr "kjernen i sikkert minne ble ful
msgid "out of core while allocating %lu bytes"
msgstr "kjernen ble full under tildeling av %lu byte"
+#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
- msgstr "feil under tildeling av minne. %s\n"
+ msgstr "feil under tildeling av minne: %s\n"
+#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr "%s:%u: valget «%s» er utgått, og har nå ingen effekt\n"
@@@ -1067,7 -806,6 +1042,7 @@@
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "ADVARSEL: valget «%s%s» er utgått, og har ingen effekt\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr "unknown debug flag '%s' ignored\n"
@@@ -1090,17 -824,14 +1065,17 @@@ msgstr "koblet til agent\n
msgid "connection to agent is in restricted mode\n"
msgstr "kobler til agent i begrenset modus\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr "ingen kjørende Dirmngr. Starter «%s»\n"
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "venter på at dirmngr skal dukke opp … (%ds)\n"
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr "koblet til dirmngr\n"
@@@ -1358,7 -1029,6 +1333,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:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
msgid "out of core\n"
msgstr "kjernen er full\n"
@@@ -1416,7 -1075,10 +1391,13 @@@ msgstr "lås «%s» ikke opprettet: %s\
msgid "waiting for lock %s...\n"
msgstr "venter på lås %s …\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr "%s er for gammel (krever %s, har %s)\n"
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "armor: %s\n"
@@@ -1556,19 -1188,14 +1537,19 @@@ msgstr "tjener «%s» er eldre enn oss
msgid "WARNING: %s\n"
msgstr "ADVARSEL: %s\n"
+#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
+#: g10/keygen.c:4883
#, c-format
msgid "OpenPGP card not available: %s\n"
- msgstr "OpenPGP-kort er ikke tilgjengelig. %s\n"
+ msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
+#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
- msgstr "OpenPGP-kortnummer %s oppdaget\n"
+ msgstr "Oppdaget OpenPGP-kortnummer %s\n"
+#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
+#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "du kan ikke gjøres dette i buntmodus\n"
@@@ -1645,10 -1252,6 +1626,10 @@@ msgstr "Adresse for henting av offentli
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Feil: Adressen er for lang (grensa er %d tegn).\n"
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, c-format
msgid "error reading '%s': %s\n"
msgstr "feil under lesing av «%s»: %s\n"
@@@ -1705,21 -1295,17 +1686,21 @@@ msgstr "CA-fingeravtrykk:
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Feil: feilformatert fingeravtrykk.\n"
+#: g10/card-util.c:1148
#, c-format
msgid "key operation not possible: %s\n"
- msgstr "nøkkelhåndtering er umulig. %s\n"
+ msgstr "klarte ikke å utføre nøkkelhandling: %s\n"
+#: g10/card-util.c:1149
msgid "not an OpenPGP card"
msgstr "ikke et OpenPGP-kort"
+#: g10/card-util.c:1162
#, c-format
msgid "error getting current key info: %s\n"
- msgstr "feil under henting av info om gjeldende nøkkel. %s\n"
+ msgstr "feil under henting av nøkkelinfo: %s\n"
+#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr "Erstatte eksisterende nøkkel? (j/N) "
@@@ -1764,12 -1342,10 +1745,12 @@@ msgstr "%s nøkkelstørrelser må ligg
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "Kortet blir nå satt opp på nytt for å lage nøkkel på %u bit\n"
+#: g10/card-util.c:1338
#, 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 "feil under endring av størrelse på nøkkel %d til %u bit: %s\n"
+#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Lage sikkerhetskopi av krypteringsnøkler utenfor kortet? (J/n) "
@@@ -1927,31 -1465,21 +1908,31 @@@ msgstr "Admin-kommandoer er ikke tillat
msgid "Invalid command (try \"help\")\n"
msgstr "Ugyldig kommando (prøv «help»)\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "«--output» virker ikke med denne kommandoen\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "klarte ikke å åpne «%s»\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
- msgstr "fant ikke nøkkelen «%s». %s\n"
+ msgstr "fant ikke nøkkelen «%s»: %s\n"
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
- msgstr "feil under lesing av nøkkelblokk. %s\n"
+ msgstr "feil under lesing av nøkkelblokk: %s\n"
+#: g10/delkey.c:118 g10/getkey.c:579
#, c-format
msgid "key \"%s\" not found\n"
msgstr "fant ikke nøkkelen «%s»\n"
@@@ -2004,36 -1521,29 +1985,36 @@@ msgstr "det finnes en hemmelig nøkkel
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "bruk valget «--delete-secret-keys» for å slette den først.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
- msgstr "feil under opprettelse av passordfrase. %s\n"
+ msgstr "feil under opprettelse av passordfrase: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "klarte ikke å bruke symmetrisk ESK-pakke på grunn av S2K-modus\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "bruker krypteringsmetode %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, c-format
msgid "'%s' already compressed\n"
msgstr "«%s» er allerede komprimert\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "ADVARSEL: «%s» er en tom fil\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, c-format
msgid "reading from '%s'\n"
msgstr "leser fra «%s»\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2041,7 -1551,6 +2022,7 @@@ msgstr "
"ADVARSEL: tvungen bruk av symmetrisk krypt.metode %s (%d) bryter med "
"mottakers oppsett\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2050,17 -1559,14 +2031,17 @@@ msgstr "
"ADVARSEL: tvungen bruk av komprimeringsalgoritme %s (%d) bryter med "
"mottakers oppsett\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "tvungen bruk av krypt.metode %s (%d) bryter med mottakers oppsett\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s kryptert for: «%s»\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "du kan ikke bruke «%s» i «%s»-modus\n"
@@@ -2164,8 -1649,6 +2145,8 @@@ msgstr "fjern så mye som mulig fra nø
msgid " - skipped"
msgstr ". Hoppet over"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, c-format
msgid "writing to '%s'\n"
msgstr "skriver til «%s»\n"
@@@ -2198,8 -1674,6 +2179,8 @@@ msgstr "feil under oppretting av «%s»
msgid "[User ID not found]"
msgstr "[Fant ikke bruker-ID]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(kontroller argument for valget «%s»)\n"
@@@ -2233,13 -1701,10 +2214,13 @@@ msgstr "feil under henting av «%s» vi
msgid "No fingerprint"
msgstr "Ingen fingeravtrykk"
+#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
+#: g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
- msgstr "fant ikke hemmelig nøkkel «%s». %s\n"
+ msgstr "fant ikke hemmelig nøkkel «%s»: %s\n"
+#: g10/getkey.c:1735
#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "Advarsel: bruker ikke «%s» som forvalgt nøkkel: %s\n"
@@@ -2264,201 -1725,150 +2245,199 @@@ msgstr "Ugyldig nøkkel %s gjort gyldi
msgid "using subkey %s instead of primary key %s\n"
msgstr "bruker undernøkkel %s i stedet for primærnøkkel %s\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
msgid "make a signature"
msgstr "lag signatur"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
msgid "make a clear text signature"
msgstr "lag klartekst-signatur"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "lag adskilt signatur"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "krypter data"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "krypter data (symmetrisk)"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "dekrypter data (forvalgt)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "bekreft signatur"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "vis nøkler"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "vis nøkler og signaturer"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "list and check key signatures"
msgstr "vis og kontroller nøkkelsignaturer"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "vis nøkler og fingeravtrykk"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "vis hemmelige nøkler"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "lag nytt nøkkelpar"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
msgid "quickly generate a new key pair"
msgstr "lag nytt nøkkelpar raskt"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
msgid "quickly add a new user-id"
msgstr "legg til en ny bruker-ID raskt"
- #: g10/gpg.c:442
- #, fuzzy
- #| msgid "quickly add a new user-id"
++#: g10/gpg.c:445
msgid "quickly revoke a user-id"
- msgstr "legg til en ny bruker-ID raskt"
+ msgstr "opphev bruker-ID raskt"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr "fullverdig generering av nøkkelpar"
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "lag opphevelsessertifikat"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "fjern nøkler fra offentlig nøkkelknippe"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "fjern nøkler fra hemmelig nøkkelknippe"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
msgid "quickly sign a key"
msgstr "hurtigsigner nøkkel"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
msgid "quickly sign a key locally"
msgstr "hurtigsigner nøkkel lokalt"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "signer nøkkel"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "signer nøkkel lokalt"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "signer eller rediger nøkkel"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "endre passordfrase"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "eksporter nøkler"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "eksporter nøkler til nøkkeltjener"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "importer nøkler fra nøkkeltjener"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "søk etter nøkler på nøkkeltjener"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "oppdater alle nøkler fra nøkkeltjener"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "importer/slå sammen nøkler"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr "vis kortstatus"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr "endre data på kort"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr "endre PIN på kort"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "oppdater tillitsdatabase"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
msgid "print message digests"
msgstr "skriv ut kontrollsum av melding"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "kjør i tjenermodus"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|VERDI|endre TOFU-regler for nøkkel"
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "lag ASCII-beskyttet utdata"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|BRUKER-ID|krypter for valgt BRUKER-ID"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|BRUKER-ID|bruk valgt BRUKER-ID til å signere eller dekryptere"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|endre komprimeringsnivå til N (0 for å slå av)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "bruk kanonisk tekstmodus"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FILE|skriv utdata til valgt FIL"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "ikke utfør valgte endringer"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "spør før overskriving"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr "bruk streng OpenPGP-oppførsel"
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2466,7 -1876,6 +2445,7 @@@ msgstr "
"@\n"
"(Se bruksanvisning for en fullstendig liste over alle kommandoer og valg)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2486,11 -1895,9 +2465,11 @@@ msgstr "
" --list-keys [navn] vis nøkler\n"
" --fingerprint [navn] vis fingeravtrykk\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Bruk: @GPG@ [valg] [filer] (-h for hjelp)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2500,7 -1907,6 +2479,7 @@@ msgstr "
"Signer, kontroller, krypter eller dekrypter.\n"
"Forvalgt handling avhenger av inndata.\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2508,583 -1914,449 +2487,578 @@@ msgstr "
"\n"
"Støttede algoritmer:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "Off. nøkkel: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Kryptering: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Komprimering: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "bruk: %s [valg] %s\n"
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "motstridende kommandoer\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "fant ingen «=»-tegn i gruppedefinisjon «%s»\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "ADVARSEL: utrygt eierskap til hjemmemappe «%s»\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "ADVARSEL: utrygt eierskap til oppsettsfil «%s»\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "ADVARSEL: utrygt eierskap til utvidelse «%s»\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "ADVARSEL: utrygge tillatelser til hjemmemappe «%s»\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "ADVARSEL: utrygge tillatelser til oppsettsfil «%s»\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "ADVARSEL: utrygge tillatelser til utvidelse «%s»\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "ADVARSEL: utrgt eierskap til foreldermapper av hjemmemappe «%s»\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "ADVARSEL: utrgt eierskap til foreldermapper av oppsettsfil «%s»\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "ADVARSEL: utrgt eierskap til foreldermapper av utvidelse «%s»\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av hjemmemappe «%s»\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av oppsettsfil «%s»\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av utvidelse «%s»\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "oppsettselementet «%s» er ukjent\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr "vis foto-id-er i nøkkelvisning"
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
msgid "show key usage information during key listings"
msgstr "vis informasjon om nøkkelbruk i nøkkelvisning"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr "vis regeladresser i signaturvisning"
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
msgid "show all notations during signature listings"
msgstr "vis alle notater i signaturvisning"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr "vis IETF-standardnotater under signaturvisning"
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr "vis brukervalgte notater under signaturvisning"
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
msgid "show preferred keyserver URLs during signature listings"
msgstr "vis foretrukne nøkkeltjener-adresser under signaturvisning"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr "vis gyldighet for bruker-ID under nøkkelvisning"
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr "vis opphevede og utgåtte bruker-id-er i nøkkelvisning"
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr "vis opphevede og utgåtte undernøkler i nøkkelvisning"
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
msgid "show the keyring name in key listings"
msgstr "vis nøkkelknippe-navn i nøkkelvisning"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
msgid "show expiration dates during signature listings"
msgstr "vis utløpsdatoer i nøkkelvisning"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
msgid "available TOFU policies:\n"
msgstr "tilgjengelige TOFU-regler:\n"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "«%s» er et ukjent TOFU-regelverk\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr "(bruk «help» for å vise valg)\n"
- #: g10/gpg.c:2041
- #, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "«%s» er et ukjent TOFU DB-format\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "Merk: gammel standardvalgfil «%s» ble ignorert\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr "libgcrypt er for gammelt (krever %s, har %s)\n"
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "Merk: %s er ikke ment for vanlig bruk.\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "«%s» er en ugyldig signatur-utløpstid\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ #| msgid "line %d: not a valid email address\n"
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "linje %d: ugyldig e-postadresse\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "PIN-inntastingsmodus «%s» er ugyldig\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "«%s» er ikke et gyldig tegnsett\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "klarte ikke å tolke nøkkeltjener-adresse\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ugyldige nøkkeltjener-valg\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
msgid "invalid keyserver options\n"
msgstr "ugyldige nøkkeltjener-valg\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ugyldige importeringsvalg\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "ugyldige importeringsvalg\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
- #, fuzzy, c-format
- #| msgid "invalid list options\n"
++#: g10/gpg.c:3061 g10/gpg.c:3076
+ #, c-format
msgid "invalid filter option: %s\n"
- msgstr "ugyldige listevalg\n"
+ msgstr "filtervalget %s er ugyldig\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ugyldige eksporteringsvalg\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "ugyldige eksporteringsvalg\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ugyldige listevalg\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
msgid "invalid list options\n"
msgstr "ugyldige listevalg\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr "vis bruker-ID under signaturbekreftelse"
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr "vis adresser til retningslinjer under signaturbekreftelse"
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
msgid "show all notations during signature verification"
msgstr "vis alle merknader under signaturbekreftelse"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr "vis IETF-standardnotater under signaturbekreftelse"
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr "vis selvvalgte merknader under signaturbekreftelse"
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
msgid "show preferred keyserver URLs during signature verification"
msgstr "vis adresser til foretrukne nøkkeltjenere under signaturbekreftelse"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
msgid "show user ID validity during signature verification"
msgstr "vis gyldighet for bruker-ID under signaturbekreftelse"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr "vis opphevede og utgåtte bruker-id-er under signaturbekreftelse"
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
msgid "show only the primary user ID in signature verification"
msgstr "bare vis primærbrukerens ID under signaturbekreftelse"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr "kontroller signaturer som har PKA-data"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr "øk tillitsnivå for signaturer med gyldige PKA-data"
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ugyldige kontrollvalg\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
msgid "invalid verify options\n"
msgstr "ugyldige kontrollvalg\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "klarte ikke å endre «exec»-sti til %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ugyldig «auto-key-locate»-liste\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr "ugyldig «auto-key-locate»-liste\n"
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: programmet kan lage en kjernefil.\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ADVARSEL: %s overstyrere %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "du kan ikke bruke %s med %s.\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s gir ikke mening med %s.\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr "ADVARSEL: kjører med falsk systemtid: "
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, c-format
msgid "will not run with insecure memory due to %s\n"
- msgstr "lar være å kjøre med usikret minne pga. %s\n"
+ msgstr "lar være å kjøre med usikret minne på grunn av %s\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt krypteringsalgoritme er ugyldig\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "valg kontrollsum-algoritme er ugyldig\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
msgid "selected compression algorithm is invalid\n"
msgstr "valgt komprimeringsalgoritme er ugyldig\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "valgt kontrollsum-algoritme for sertifisering er ugyldig\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "«completes-needed» må være større enn 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "«marginals-needed» må være større enn 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "«max-cert-depth» må være mellom 1 og 255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "ugyldig «default-cert-level» (må være 0, 1, 2 eller 3)\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ugyldig «min-cert-level» (må være 0, 1, 2 eller 3)\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Merk: enkel S2K-modus (0) er sterkt frarådet\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ugyldig S2K-modus (må være 0, 1 eller 3)\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "ugyldig standardoppsett\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "ugyldig personlig oppsett av krypteringsmetode\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "ugyldig personlig oppsett av kontrollsummetode\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "ugyldig personlig oppsett av komprimeringsmetode\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s virker ikke enda med %s\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "du kan ikke bruke krypteringsalgoritme «%s» i %s-modus\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "du kan ikke bruke summeringsalgoritme «%s» i %s-modus\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "du kan ikke bruke komprimeringsalgoritme «%s» i «%s»-modus\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "klarte ikke å starte tillitsdatabase (TrustDB): %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "ADVARSEL: mottakere (-r) valgt uten offentlig nøkkelkryptering\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [filnavn]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [filnavn]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "symmetrisk kryptering av «%s» mislyktes: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [filnavn]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filnavn]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "du kan ikke bruke «--symmetric --encrypt» og «--s2k-mode 0» samtidig\n"
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "du kan ikke velge «--symmtric» og «--encrypt» i «%s»-modus\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [filnavn]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filnavn]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
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:3989
++#: g10/gpg.c:3978
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "du kan ikke velge «--symmtric», «--sign» og «--encrypt» i «%s»-modus\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnavn]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [filnavn]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key bruker-ID"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key bruker-ID"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key bruker-ID [kommandoer]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
msgid "--passwd <user-id>"
msgstr "--passwd <bruker-id>"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "sending til nøkkeltjener mislyktes: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "mottak fra nøkkeltjener mislyktes: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "nøkkeleksport mislyktes: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "eksportering som ssh-nøkkel mislyktes: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "søk på nøkkeltjener mislyktes: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "oppdatering av nøkkeltjener mislyktes: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dearmoring failed: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enarmoring failed: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "«%s» er en ugyldig summeringsalgoritme\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "feil under tolking av nøkkelspesifikasjon «%s»: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, 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:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[filnavn]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Skriv inn melding …\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "valgt adresse for sertifikasjonsregler er ugyldig\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "valgt adresse for signaturregler er ugyldig\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
msgid "the given preferred keyserver URL is invalid\n"
msgstr "valgt adresse for foretrukket nøkkeltjener er ugyldig\n"
@@@ -3125,135 -2389,105 +3099,133 @@@ msgstr "Ingen hjelp tilgjengelig
msgid "No help available for '%s'"
msgstr "Ingen hjelp tilgjengelig for «%s»"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr "importer signaturer som er merket som kun lokale"
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr "reparer skader fra pks-nøkkeltjener under importering"
- #: g10/import.c:140
++#: g10/import.c:144
msgid "do not clear the ownertrust values during import"
msgstr "ikke tøm «ownertrust»-verdier under importering"
- #: g10/import.c:143
++#: g10/import.c:147
msgid "do not update the trustdb after import"
msgstr "ikke oppdater tillitsdatabase etter importering"
- #: g10/import.c:146
- #, fuzzy
- #| msgid "show key fingerprint"
++#: g10/import.c:150
msgid "show key during import"
- msgstr "vise nøkkelens fingeravtrykk"
+ msgstr "vis nøkkel under importering"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr "bare godta oppdateringer av nøkler som finnes allerede"
- #: g10/import.c:152
++#: g10/import.c:156
msgid "remove unusable parts from key after import"
msgstr "fjern ubrukelige deler av nøkkel etter importering"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr "fjern så mye som mulig fra nøkkel etter importering"
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
- msgstr ""
+ msgstr "kjør importeringsfiltre og eksporter nøkkel umiddelbart"
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "hopper over blokk av typen %d\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu nøkler behandlet hittil\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Totalt antall behandlet: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " hopper over PGP 2-nøkler: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " nye nøkler som ble hoppet over: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " uten bruker-id-er: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importert: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " uendret: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nye bruker-id-er: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nye undernøkler: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " nye signaturer: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nye nøkkelopphevinger: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " leste hemmelige nøkler: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importerte hemmelige nøkler: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " uforandrede hemmelige nøkler: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " ikke importert: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " oppryddete signaturer: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " tømte bruker-id-er: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3262,190 -2496,152 +3234,190 @@@ msgstr "
"ADVARSEL: nøkkelen %s inneholder innstillinger for\n"
"utilgjengelige algoritmer på følgende bruker-id-er:\n"
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " «%s»: innstilling for krypteringsalgoritme %s\n"
- #: g10/import.c:1042
++#: g10/import.c:1048
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " «%s»: oppsett for kontrollsum-algoritme %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " «%s»: oppsett av komprimeringsalgoritme %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "du anbefales på det sterkeste å endre oppsett og\n"
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"dele ut denne nøkkelen på nytt for å unngå potensielle problemer med "
"algoritme-samsvar\n"
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"oppdater oppsettet med følgende kommando: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, c-format
msgid "key %s: no user ID\n"
msgstr "nøkkel %s: ingen bruker-ID\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, c-format
msgid "key %s: %s\n"
msgstr "nøkkel %s: %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr "avvist av importeringskontrollør"
- #: g10/import.c:1264
++#: g10/import.c:1343
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "nøkkel %s: PKS-undernøkkel reparert\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "nøkkel %s: akseptert ikke-selvsignert bruker-ID «%s»\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "nøkkel %s: ingen gyldig bruker-id-er\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "dette kan skyldes manglende selvsignatur\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, c-format
msgid "key %s: public key not found: %s\n"
- msgstr "nøkkel %s: fant ikke offentlig nøkkel. %s\n"
+ msgstr "nøkkel %s: fant ikke offentlig nøkkel: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "nøkkel %s: ny nøkkel. Hoppet over\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
- msgstr "fant ikke skrivbart nøkkelknippe. %s\n"
+ msgstr "fant ikke skrivbart nøkkelknippe: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "feil under skriving av nøkkelknippe «%s»: %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "nøkkel %s: offentlig nøkkel «%s» importert\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "nøkkel %s: stemmer ikke med vår kopi\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "nøkkel %s: finner ikke original nøkkelblokk: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
- msgstr "nøkkel %s: klarte ikke å lese opprinnelig nøkkelblokk. %s\n"
+ msgstr "nøkkel %s: klarte ikke å lese opprinnelig nøkkelblokk: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "nøkkel %s: «%s» 1 ny bruker-ID\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "nøkkel %s: «%s» 1 ny signatur\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "nøkkel %s: «%s» 1 ny undernøkkel\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "nøkkel %s: «%s» %d nye undernøkler\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "nøkkel %s: «%s» ikke endret\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, c-format
msgid "key %s: secret key imported\n"
msgstr "nøkkel %s: hemmelig nøkkel importert\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "nøkkel %s: hemmelig nøkkel finnes allerede\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "nøkkel %s: feil under sending til agent: %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, c-format
msgid "secret key %s: %s\n"
msgstr "hemmelig nøkkel %s: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
msgid "importing secret keys not allowed\n"
msgstr "importering av hemmelig nøkkel er ikke tillatt\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
@@@ -3461,141 -2657,114 +3433,141 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr "Kjør følgende kommando for å flytte «%s»: %s\n"
- #: g10/import.c:2133
++#: g10/import.c:2226
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"nøkkel %s: offentlig nøkkel mangler. Klarte ikke å bruke "
"opphevelsessertifikat\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "nøkkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "nøkkel %s: «%s» opphevingssertifikat importert\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "nøkkel %s: ingen bruker-ID for signatur\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"nøkkel %s: offentlig nøkkelalgoritme for bruker-ID («%s») støttes ikke\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "nøkkel %s: ugyldig selvsignatur for bruker-ID «%s»\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "nøkkel %s: ustøttet offentlig nøkkelalgoritme\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "nøkkel %s: ugyldig direkte nøkkelsignatur\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "nøkkel %s: ingen undernøkkel for nøkkelbinding\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "nøkkel %s: ugyldig undernøkkelbinding\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "nøkkel %s: fjernet flere undernøkkelbindinger\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "nøkkel %s: ingen undernøkkel for nøkkeloppheving\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "nøkkel %s: ugyldig undernøkkeloppheving\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "nøkkel %s: fjernet flere undernøkkelopphevinger\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "nøkkel %s: hoppet over bruker-ID «%s»\n"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "nøkkel %s: hoppet over undernøkkel\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "nøkkel %s: ikke-eksporterbar signatur (klasse 0x%02X) - hoppet over\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "nøkkel %s: opphevingssertifikat på feil plass - hoppet over\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "nøkkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "nøkkel %s: undernøkkelsignatur på feil plass - hoppet over\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "nøkkel %s: uforventet signaturklasse (0x%02X) - hoppet over\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "nøkkel %s: oppdaget duplisert bruker-ID. Slått sammen\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "ADVARSEL: nøkkel %s kan være opphevet: henter opphevingsnøkkel %s\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"ADVARSEL: nøkkel %s kan være opphevet: opphevingsnøkkel %s ikke tilstede.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "nøkkel %s: «%s» opphevingssertifikat lagt til\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "nøkkel %s: direkte nøkkelsignatur lagt til\n"
@@@ -3630,12 -2793,10 +3602,12 @@@ msgstr "nøkkelblokkressurs «%s»: %s\
msgid "error opening key DB: %s\n"
msgstr "feil under åpning av nøkkeldatabase: %s\n"
+#: g10/keydb.c:1778
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
- msgstr "klarte ikke å bygge hurtiglager for nøkkelknippe på nytt. %s\n"
+ msgstr "klarte ikke å bygge hurtiglager for nøkkelknippe på nytt: %s\n"
+#: g10/keyedit.c:264
msgid "[revocation]"
msgstr "[oppheving]"
@@@ -3930,8 -3037,6 +3902,8 @@@ msgstr "Jeg har sjekket denne nøkkele
msgid "Really sign? (y/N) "
msgstr "Er du sikker på at du vil signere? (j/N) "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "signering mislyktes: %s\n"
@@@ -4264,13 -3293,10 +4236,12 @@@ msgstr "oppdatering mislyktes: %s\n
msgid "Key not changed so no update needed.\n"
msgstr "Nøkkelen ble ikke endret, så ingen oppdatering er nødvendig.\n"
+#: g10/keyedit.c:3025
- #, fuzzy, c-format
- #| msgid "Key generation failed: %s\n"
+ #, c-format
msgid "User ID revocation failed: %s\n"
- msgstr "Nøkkelgenerering mislyktes: %s\n"
+ msgstr "oppheving av bruker-ID mislyktes: %s\n"
+#: g10/keyedit.c:3070
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "«%s» er ikke et fingeravtrykk\n"
@@@ -4383,13 -3385,9 +4354,13 @@@ msgstr "
"Merk: du bør starte programmet på nytt for å sikre at nøkkel-gyldigheten\n"
"som vises her er riktig.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
msgid "revoked"
msgstr "opphevet"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "utgått"
@@@ -4660,12 -3602,10 +4631,12 @@@ msgstr "Er du sikker på at du vil lag
msgid "no secret key\n"
msgstr "ingen hemmelig nøkkel\n"
+#: g10/keyedit.c:6230
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
- msgstr ""
+ msgstr "prøvde å oppheve ID som ikke tilhørte en bruker: %s\n"
+#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "bruker-ID «%s» er allerede opphevet\n"
@@@ -5183,12 -4029,10 +5154,12 @@@ msgstr "Merk: sikkerhetskopi av kortnø
msgid "writing public key to '%s'\n"
msgstr "skriver offentlig nøkkel til «%s»\n"
+#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
- msgstr "fant ikke skrivbart offentlig nøkkelknippe. %s\n"
+ msgstr "fant ikke skrivbart offentlig nøkkelknippe: %s\n"
+#: g10/keygen.c:4323
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "feil under skriving av offentlig nøkkelknippe «%s»: %s\n"
@@@ -5314,33 -4134,28 +5285,33 @@@ msgstr " Nøkkelfingeravtrykk =
msgid " Card serial no. ="
msgstr " Serienummer for kort ="
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, c-format
msgid "caching keyring '%s'\n"
msgstr "hurtiglagrer nøkkelknippe «%s»\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "%lu nøkler hurtiglagret så langt (%lu signatur)\n"
msgstr[1] "%lu nøkler hurtiglagret så langt (%lu signaturer)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] "%lu nøkkel hurtiglagret"
msgstr[1] "%lu nøkler hurtiglagret"
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, c-format
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
msgstr[0] " (%lu signatur)\n"
msgstr[1] " (%lu signaturer)\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: laget nøkkelknippe\n"
@@@ -5553,113 -4323,94 +5524,119 @@@ msgstr "selvstendig opphevelse - bruk �
msgid "no signature found\n"
msgstr "fant ikke signatur\n"
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, c-format
msgid "BAD signature from \"%s\""
msgstr "DÅRLIG signatur fra «%s»"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Utgått signatur fra «%s»"
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, c-format
msgid "Good signature from \"%s\""
msgstr "God signatur fra «%s»"
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "signaturbekreftelse ble hindret\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
msgid "can't handle this ambiguous signature data\n"
msgstr "disse flertydige signaturdataene kan ikke behandles\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, c-format
msgid "Signature made %s\n"
msgstr "Signatur opprettet %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, c-format
msgid " using %s key %s\n"
msgstr " bruker %s nøkkel %s\n"
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Signatur laget %s ved hjelp av %s-nøkkel ID %s\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ #| msgid " aka \"%s\""
+ msgid " issuer \"%s\"\n"
+ msgstr " aka «%s»"
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "Nøkkel tilgjengelig ved: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[usikker]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, c-format
msgid " aka \"%s\""
msgstr " aka «%s»"
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "Signatur utgått %s\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "Signatur utgår %s\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s-signatur, kontrollsum-algoritme %s%s%s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "binær"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "tekstmodus"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "ukjent"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
msgid ", key algorithm "
msgstr ", nøkkelalgoritme"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr "ADVARSEL: ikke en separat signatur. Fila «%s» er IKKE bekreftet.\n"
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Klarte ikke å kontrollere signatur: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "ikke en separat signatur\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "ADVARSEL: fant flere signaturer. Kontrollerer bare den første.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "separat signatur av klasse 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "gammeldags (PGP 2.x) signatur\n"
@@@ -5832,84 -4548,39 +5809,50 @@@ msgstr "ADVARSEL: det er usikkert å kr
msgid "subpacket of type %d has critical bit set\n"
msgstr "underpakke %d er merket som kritisk\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, c-format
msgid "problem with the agent: %s\n"
msgstr "problem med agent: %s\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, c-format
- msgid " (main key ID %s)"
- msgstr " (hovednøkkelid %s)"
-
- #: g10/passphrase.c:277
- #, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Skriv inn passordfrase for å låse opp hemmelig nøkkel til OpenPGP-"
- "sertifikat:\n"
- "«%.*s»\n"
- "%u-bit %s-nøkkel, ID %s,\n"
- "opprettet %s%s.\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Skriv inn passordfrase\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "avbrutt av bruker\n"
- #: g10/passphrase.c:483
- #, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "Du trenger en passordfrase for å låse opp hemmelig nøkkel for\n"
- "brukeren «%s»\n"
-
- #: g10/passphrase.c:491
++#: g10/passphrase.c:489
#, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%u-bit %s-nøkkel, ID %s, opprettet %s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr " (undernøkkel av hovednøkkel-ID %s)"
+ msgid " (main key ID %s)"
+ msgstr " (hovednøkkelid %s)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Skriv inn passordfrase for å låse opp hemmelig OpenPGP-nøkkel:"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Skriv inn passordfrase for å importere hemmelig OpenPGP-nøkkel:"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Skriv inn passordfrase for å eksportere hemmelig OpenPGP-undernøkkel:"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Skriv inn passordfrase for å eksportere hemmelig OpenPGP-nøkkel:"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr ""
"Er du sikker på at du vil slette følgende hemmelige OpenPGP-undernøkkel:"
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Er du sikker på at du vil slette følgende hemmelige OpenPGP-nøkkel:"
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, c-format
msgid ""
"%s\n"
@@@ -6110,125 -4746,98 +6053,125 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "Vil du bruke denne nøkkelen likevel? (j/N) "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "ADVARSEL: du bruker en upålitelig nøkkel.\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr ""
"ADVARSEL: nøkkel %s kan være opphevet: opphevingsnøkkel %s ikke tilstede.\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "ADVARSEL: denne nøkkelen er opphevet.\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "ADVARSEL: denne nøkkelen er opphevet av eieren.\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
msgid " This could mean that the signature is forged.\n"
msgstr " Dette kan bety at signaturen er falsk.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "ADVARSEL: denne undernøkkelen er opphevet av eieren.\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Merk: Denne nøkkelen er ikke i bruk.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Merk: Bekreftet signeringsadresse er «%s»\n"
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "Merk: Signeringsadresse «%s» samsvarer ikke med DNS-oppslag\n"
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "tillitsnivå oppjustert til «FULL» pga. gyldig PKA-info\n"
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "tillitsnivå nedjustert til «NEVER» (aldri) pga. ugyldig PKA-info\n"
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Merk: denne nøkkelen er utgått.\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
"ADVARSEL: denne nøkkelen er ikke sertifisert med en tillitsverdig signatur.\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Det er ingen indikasjon på at signaturen tilhører eieren.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ADVARSEL: vi stoler IKKE på denne nøkkelen.\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " Signaturen er sannsynligvis et FALSKNERI.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
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:666
++#: g10/pkclist.c:670
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:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: hoppet over: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, 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:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: hoppet over: offentlig nøkkel er allerede tilstede\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, c-format
msgid "can't encrypt to '%s'\n"
msgstr "klarte ikke å kryptere til «%s»\n"
- #: g10/pkclist.c:984
++#: g10/pkclist.c:988
#, 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:991
++#: g10/pkclist.c:995
#, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "valgt «%s», men mangler valget «%s»\n"
- #: g10/pkclist.c:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr "Gjeldende mottakere:\n"
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6236,37 -4845,29 +6179,37 @@@ msgstr "
"\n"
"Skriv inn bruker-ID og avslutt med tom linje: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Bruker-id-en finnes ikke.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
msgid "skipped: public key already set as default recipient\n"
msgstr "hoppet over: offentlig nøkkel allerede valgt som standardmottaker\n"
- #: g10/pkclist.c:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "Offentlig nøkkel er ikke i bruk.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "hoppet over: offentlig nøkkel er allerede valgt\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "«%s» er en ukjent standardmottaker\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "ingen gyldige mottakere\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Merk: nøkkel %s har ingen %s-funksjon\n"
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Merk: nøkkel %s har ingen innstilling for %s\n"
@@@ -6333,13 -4920,10 +6276,13 @@@ msgstr "Merk: hemmelig nøkkel %s utgå
msgid "Note: key has been revoked"
msgstr "Merk: nøkkelen er opphevet"
+#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
+#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
- msgstr "build_packet mislyktes. %s\n"
+ msgstr "build_packet mislyktes: %s\n"
+#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
msgstr "nøkkel %s: ingen bruker-ID\n"
@@@ -6389,10 -4963,9 +6332,10 @@@ msgid "
"to retract such a revocation certificate once it has been published."
msgstr ""
"Et opphevelsessertifikat er en slags nødknapp som lar deg\n"
- "\verklære offentlig at en nøkkel ikke skal brukes mer. Det er ikke mulig\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:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6403,11 -4976,10 +6346,11 @@@ 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"
- "\vopphevelsessertifikat og oppgi en grunn til opphevelsen.\n"
- "\vSe beskrivelse av kommandoen «--gen-revoke» i GnuPG-\n"
+ "opphevelsessertifikat og oppgi en grunn til opphevelsen.\n"
+ "Se beskrivelse av kommandoen «--gen-revoke» i GnuPG-\n"
"bruksanvisninga for detaljer."
+#: g10/revoke.c:575
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"
@@@ -6553,7 -5102,6 +6496,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "offentlig nøkkel %s er %lu dag nyere enn signaturen\n"
msgstr[1] "offentlig nøkkel %s er %lu dager nyere enn signaturen\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6623,22 -5162,18 +6566,22 @@@ msgstr "
"ADVARSEL: klarte ikke å %%-utvide foretrukket nøkkeltjener-adresse (for "
"lang).\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s-signatur fra: «%s»\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "ADVARSEL: tvungen bruk av %s (%d) bryter med mottakerens oppsett\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "signerer:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "bruker %s-kryptering\n"
@@@ -6661,12 -5192,10 +6604,12 @@@ msgid "this is a PGP generated Elgamal
msgstr ""
"dette er en PGP-generelt Elgamal-nøkkel, og egner seg ikke til signering."
+#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
- msgstr "tillitsoppføring %lu, type %d: skriving mislyktes. %s\n"
+ msgstr "tillitsoppføring %lu, type %d: skriving mislyktes: %s\n"
+#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6706,12 -5228,10 +6649,12 @@@ msgstr "feil under søk etter tillitspo
msgid "read error in '%s': %s\n"
msgstr "lesefeil i «%s»: %s\n"
+#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
- msgstr "trustdb: synk mislyktes. %s\n"
+ msgstr "trustdb: synk mislyktes: %s\n"
+#: g10/tdbio.c:141 sm/keydb.c:355
#, c-format
msgid "can't create lock for '%s'\n"
msgstr "klarte ikke å lage lås for «%s»\n"
@@@ -6721,17 -5240,14 +6664,17 @@@
msgid "can't lock '%s'\n"
msgstr "klarte ikke å låse «%s»\n"
+#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
- msgstr "trustdb-oppf. %lu: lseek mislyktes. %s\n"
+ msgstr "trustdb-oppf. %lu: lseek mislyktes: %s\n"
+#: g10/tdbio.c:213 g10/tdbio.c:1798
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
- msgstr "trustdb-oppf. %lu: skriving mislyktes (n=%d). %s\n"
+ msgstr "trustdb-oppf. %lu: skriving mislyktes (n=%d): %s\n"
+#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "trustdb-transaksjon er for stor\n"
@@@ -6740,17 -5255,14 +6683,17 @@@
msgid "%s: directory does not exist!\n"
msgstr "%s: mappa finnes ikke.\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, c-format
msgid "can't access '%s': %s\n"
msgstr "fikk ikke tilgang til «%s»: %s\n"
+#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
- msgstr "%s: klarte ikke å lage versjonsoppføring. %s"
+ msgstr "%s: klarte ikke å lage versjonsoppføring: %s"
+#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: laget ugyldig trustdb\n"
@@@ -6769,38 -5278,30 +6712,38 @@@ msgstr "Merk: trustdb er ikke skrivbar\
msgid "%s: invalid trustdb\n"
msgstr "%s: ugyldig trustdb\n"
+#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
- msgstr "%s: klarte ikke å lage kontrollsum-tabell. %s\n"
+ msgstr "%s: klarte ikke å lage kontrollsum-tabell: %s\n"
+#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
- msgstr "%s: feil under oppdatering av versjonsoppføring. %s\n"
+ msgstr "%s: feil under oppdatering av versjonsoppføring: %s\n"
+#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
+#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
- msgstr "%s: feil under lesing av versjonsoppføring. %s\n"
+ msgstr "%s: feil under lesing av versjonsoppføring: %s\n"
+#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
- msgstr "%s: feil under skriving av versjonsoppføring. %s\n"
+ msgstr "%s: feil under skriving av versjonsoppføring: %s\n"
+#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
- msgstr "trustdb: lseek mislyktes. %s\n"
+ msgstr "trustdb: lseek mislyktes: %s\n"
+#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
- msgstr "trustdb: lesing mislyktes (n=%d). %s\n"
+ msgstr "trustdb: lesing mislyktes (n=%d): %s\n"
+#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: ikke en trustdb-fil\n"
@@@ -6815,27 -5314,22 +6758,27 @@@ msgstr "%s: versjonsoppføring nr. %lu\
msgid "%s: invalid file version %d\n"
msgstr "%s: %d er en ugyldig filversjon\n"
+#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
- msgstr "%s: feil under lesing av «free»-oppføring. %s\n"
+ msgstr "%s: feil under lesing av «free»-oppføring: %s\n"
+#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
- msgstr "%s: feil under skriving av «dir»-oppføring. %s\n"
+ msgstr "%s: feil under skriving av «dir»-oppføring: %s\n"
+#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
- msgstr "%s: klarte ikke å nullstille oppføring. %s\n"
+ msgstr "%s: klarte ikke å nullstille oppføring: %s\n"
+#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
- msgstr "%s: klarte ikke å legge til oppføring. %s\n"
+ msgstr "%s: klarte ikke å legge til oppføring: %s\n"
+#: g10/tdbio.c:1865
msgid "Error: The trustdb is corrupted.\n"
msgstr "Error: trustdb er skadet.\n"
@@@ -6849,66 -5341,46 +6792,58 @@@ msgstr "tekstlinjer som er lengre enn %
msgid "input line longer than %d characters\n"
msgstr "inndata-linje er lengre enn %d tegn\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "feil under transaksjonsstart i TOFU-database: %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr "feil under ferdigstillelse av transaksjon i TOFU-database: %s\n"
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr "feil under reversering av transaksjon i TOFU-database: %s\n"
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr "TOFU-databaseversjon støttes ikke: %s\n"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "feil under lesing av TOFU-database: %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, c-format
msgid "error determining TOFU database's version: %s\n"
msgstr "klarte ikke å kontrollere versjon av TOFU-database: %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, c-format
msgid "error initializing TOFU database: %s\n"
msgstr "feil under oppstart av TOFU-database: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "feil under åpning av TOFU-database «%s»: %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr "Advarsel: Hjemmemappe inneholder både «tofu.db» og «tofu.d».\n"
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr "Bruker splittformat for TOFU-database\n"
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "feil under oppdatering av TOFU-database: %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr "Tilknytning %s er ukjent."
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
@@@ -6917,7 -5389,6 +6852,7 @@@ msgstr "
"Nøkkel med fingeravtrykk %s forårsaket konflikt med tilknytning %s. Siden "
"regelen var «auto» er den nå endret til «ask» (spør)."
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
@@@ -6926,70 -5397,58 +6861,70 @@@ msgstr "
"Oppgi hvorvidt du tror tilknytninga %s%ser sannferdig (dvs.: at nøkkelen "
"tilhører personen som hevder å eie den) eller falsk."
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "feil under henting av andre bruker-id-er: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr "Kjente bruker-id-er tilknyttet denne nøkkelen:\n"
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, c-format
msgid "policy: %s"
msgstr "regelverk: %s"
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, c-format
msgid "error gathering signature stats: %s\n"
msgstr "feil under henting av signaturstatistikk: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] "E-postadressen «%s» er tilknyttet %d nøkkel:\n"
msgstr[1] "E-postadressen «%s» er tilknyttet %d nøkler:\n"
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "Statistikk for nøkler med e-postadresse «%s»:\n"
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
msgid "this key"
msgstr "denne nøkkelen"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] "%ld melding signert i fremtid."
msgstr[1] "%ld meldinger signert i fremtid."
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "%ld melding signert"
msgstr[1] "%ld meldinger signert"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] " i løpet av gårsdagen (%ld)."
msgstr[1] " i løpet av de %ld siste dagene."
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] " i løpet av den siste uka (%ld)."
msgstr[1] " i løpet av de siste %ld ukene."
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -6999,81 -5458,68 +6934,81 @@@ msgstr[1] " i løpet av de siste %ld m�
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr "TOFU oppdaget en tilknytningskonflikt"
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr "gGaAuUnNdD"
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr "(G)od, (A)ksepter én gang, (U)kjent, (N)ekt én gang, (D)årlig? "
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "feil under endring av tillitsnivå for TOFU-tilknytning til %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "feil under endring av TOFU-regler: %s\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] "%d~år"
msgstr[1] "%d~år"
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] "%d~måned"
msgstr[1] "%d~måneder"
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] "%d~dag"
msgstr[1] "%d~dager"
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] "%d~time"
msgstr[1] "%d~timer"
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] "%d~minutt"
msgstr[1] "%d~minutter"
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] "%d~sekund"
msgstr[1] "%d~sekunder"
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr "Har aldri bekreftet en melding som er signert av nøkkel %s.\n"
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
@@@ -7082,12 -5528,10 +7017,12 @@@ msgstr "
"Klarte ikke å samle inn signaturstatistikk for «%s»\n"
"(nøkkel %s)\n"
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, c-format
msgid "Verified %ld messages signed by \"%s\"."
msgstr "Bekreftet %ld meldinger signert av «%s»."
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7102,23 -5546,19 +7037,23 @@@ msgstr[1] "
"Bekreftet %ld meldinger signert av «%s»\n"
"siste %s."
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr "Nyeste melding ble bekreftet for %s siden."
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
"Advarsel: vi har enda ikke sett en melding som er signert av denne "
"nøkkelen.\n"
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
"Advarsel: vi har bare sett én melding som er signert av denne nøkkelen.\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7145,8 -5585,6 +7080,7 @@@ msgstr[1] "
"Bruk %s \n"
"for å markere nøkkelen som ugyldig hvis den virker mistenkelig.\n"
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "feil under åpning av TOFU-database: %s\n"
@@@ -7176,12 -5609,10 +7110,12 @@@ msgstr "nøkkel %s: ingen offentlig nø
msgid "key %s marked as ultimately trusted\n"
msgstr "nøkkel %s markert som endelig betrodd.\n"
+#: g10/trustdb.c:340
#, 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 "tillitsoppføring %lu, foresp.type %d: lesing mislyktes: %s\n"
+#: g10/trustdb.c:346
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "tillitsoppføring %lu er ikke av forespurt type (%d)\n"
@@@ -7272,9 -5686,8 +7206,9 @@@ msgstr "
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
- "klarte ikke å oppdatere trustdb-versjonsoppføring. Skriving mislyktes. %s\n"
+ "klarte ikke å oppdatere trustdb-versjonsoppføring. Skriving mislyktes: %s\n"
+#: g10/trust.c:105
msgid "undefined"
msgstr "udefinert"
@@@ -7481,10 -5850,9 +7415,10 @@@ msgstr "bruker forvalgt PIN som %s\n
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
- "klarte ikke å bruke forvalgt PIN som %s. %s. Lar være å bruke forvalgt PIN "
+ "klarte ikke å bruke forvalgt PIN som %s: %s. Lar være å bruke forvalgt PIN "
"senere\n"
+#: scd/app-openpgp.c:1730
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Skriv inn PIN%%0A[signaturer utført: %lu]"
@@@ -7600,12 -5943,10 +7534,12 @@@ msgstr "tidsstempel for opprettelse man
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA-primtall %s mangler eller er av annen størrelse enn %d bit\n"
+#: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
#, c-format
msgid "failed to store the key: %s\n"
- msgstr "klarte ikke å lagre nøkkel. %s\n"
+ msgstr "klarte ikke å lagre nøkkel: %s\n"
+#: scd/app-openpgp.c:3320
msgid "unsupported curve\n"
msgstr "ustøttet kurve\n"
@@@ -7667,7 -5996,6 +7601,7 @@@ msgstr "|N|Ny PIN
msgid "run in multi server mode (foreground)"
msgstr "kjør i multi-tjenermodus (forgrunn)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NIVÅ|endre feilsøkingsnivå til valgt NIVÅ"
@@@ -7719,16 -6036,13 +7653,16 @@@ msgstr "
"Syntaks: scdaemon [valg] [kommando [arg]]\n"
"Smartcard-bakgrunnsprogram for @GNUPG@\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
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:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr "startet håndteringsprogram for fd %d\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "avsluttet håndteringsprogram for fd %d\n"
@@@ -7827,12 -6118,10 +7761,12 @@@ msgstr "kontroller at «dirmngr» er in
msgid "checking the CRL failed: %s"
msgstr "kontroll av CRL mislyktes: %s"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr "sertifikat med ugyldig gyldighetsverdi: %s"
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr "sertifikatet er ikke gyldig enda"
@@@ -7844,7 -6131,6 +7778,7 @@@ msgstr "rotsertifikat er ikke gyldig en
msgid "intermediate certificate not yet valid"
msgstr "mellomsertifikat er ikke gyldig enda"
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
msgid "certificate has expired"
msgstr "sertifikatet er utgått"
@@@ -7893,7 -6168,6 +7827,7 @@@ msgstr " (sertifikat gyldig fra
msgid " ( issuer valid from "
msgstr " ( utsteder gyldig fra "
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, c-format
msgid "fingerprint=%s\n"
msgstr "fingeravtrykk=%s\n"
@@@ -7923,7 -6191,6 +7857,7 @@@ msgstr "fant ingen utsteder i sertifika
msgid "self-signed certificate has a BAD signature"
msgstr "selvsignert sertifikat har ugyldig signatur"
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr "rotsertifikat er ikke merket som troverdig"
@@@ -7932,28 -6198,22 +7866,28 @@@
msgid "checking the trust list failed: %s\n"
msgstr "kontroll av tillitsliste mislyktes: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr "sertifikatkjede er for langt\n"
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr "fant ikke utstedersertifikat"
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
msgid "certificate has a BAD signature"
msgstr "sertifikatet har ugyldig signatur"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr "fant et annet CA-sertifikat som kan fungere. Prøver igjen"
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr "sertifikatkjede er lengre enn CA tillater (%d)"
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
msgid "certificate is good\n"
msgstr "sertifikatet er gyldig\n"
@@@ -7983,7 -6237,6 +7917,7 @@@ msgstr "kontrollsum på %u bit er ugyld
msgid "(this is the MD2 algorithm)\n"
msgstr "(dette er algortime MD2)\n"
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
msgid "none"
msgstr "ingen"
@@@ -8018,36 -6266,28 +7952,36 @@@ msgstr "
"S/N %s, ID 0x%08lX,\n"
"opprettet %s, utgår %s.\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr "ingen bruksområder for nøkler valgt. Antar alle bruksområder\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "feil under henting av informasjon om nøkkelbruk: %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr "sertifikatet skulle ikke vært brukt til sertifisering\n"
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr "sertifikatet skulle ikke vært brukt til OCSP-responssignering\n"
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr "sertifikatet skulle ikke vært brukt til kryptering\n"
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr "sertifikatet skulle ikke vært brukt til signering\n"
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr "sertifikatet egner seg ikke til kryptering\n"
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr "sertifikatet egner seg ikke til signering\n"
@@@ -8443,12 -6598,10 +8377,12 @@@ msgstr "
"Signer, kontroller, krypter eller dekrypter.\n"
"Forvalgt handling avhenger av inndata.\n"
+#: sm/gpgsm.c:771
#, 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 "Merk: det er ikke mulig å kryptere til «%s»: %s\n"
+#: sm/gpgsm.c:782
#, c-format
msgid "unknown validation model '%s'\n"
msgstr "«%s» er en ukjent kontrollmodell\n"
@@@ -8468,21 -6618,17 +8402,21 @@@ msgstr "%s:%u: passord skrevet inn ute
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: hopper over denne linja\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
msgid "could not parse keyserver\n"
msgstr "klarte ikke å tolke nøkkeltjener\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "importerer sertifikat «%s»\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "klarte ikke å signere med «%s»: %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr "ugyldig kommando (implisitt kommando finnes ikke)\n"
@@@ -8543,7 -6677,6 +8477,7 @@@ msgstr "det oppstod en feil under nytt
msgid "error storing flags: %s\n"
msgstr "feil under lagring av valg: %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr "Feil - "
@@@ -8645,118 -6762,89 +8579,113 @@@ msgstr " også kjent som
msgid "This is a qualified signature\n"
msgstr "Dette er en godkjent signatur\n"
+#: dirmngr/certcache.c:106
#, c-format
msgid "can't initialize certificate cache lock: %s\n"
- msgstr "klarte ikke å starte låsing av sertifikat-hurtiglager. %s\n"
+ msgstr "klarte ikke å starte låsing av sertifikat-hurtiglager: %s\n"
+#: dirmngr/certcache.c:117
#, c-format
msgid "can't acquire read lock on the certificate cache: %s\n"
- msgstr "klarte ikke å sperre sertifikat-hurtiglager for lesing. %s\n"
+ msgstr "klarte ikke å sperre sertifikat-hurtiglager for lesing: %s\n"
+#: dirmngr/certcache.c:128
#, c-format
msgid "can't acquire write lock on the certificate cache: %s\n"
- msgstr "klarte ikke å sperre sertifikat-hurtiglager for skriving. %s\n"
+ msgstr "klarte ikke å sperre sertifikat-hurtiglager for skriving: %s\n"
+#: dirmngr/certcache.c:139
#, c-format
msgid "can't release lock on the certificate cache: %s\n"
- msgstr "klarte ikke å låse opp sertifikat-hurtiglager. %s\n"
+ msgstr "klarte ikke å låse opp sertifikat-hurtiglager: %s\n"
+#: dirmngr/certcache.c:267
#, c-format
msgid "dropping %u certificates from the cache\n"
msgstr "fjerner %u sertifikater fra hurtiglager\n"
- #: dirmngr/certcache.c:352
- #, c-format
- msgid "can't access directory '%s': %s\n"
- msgstr "fikk ikke tilgang til mappa «%s»: %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, c-format
msgid "can't parse certificate '%s': %s\n"
msgstr "klarte ikke å tolke sertifikat «%s»: %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, c-format
msgid "certificate '%s' already cached\n"
msgstr "sertifikat «%s» ligger allerede i hurtiglager\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "lastet inn tillitsmerket sertifikat «%s»\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, c-format
msgid "certificate '%s' loaded\n"
msgstr "lastet inn sertifikat «%s»\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr " SHA1-fingeravtrykk = %s\n"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr " utsteder ="
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr " emne ="
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "feil under innlasting av sertifikat «%s»: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, c-format
msgid "permanently loaded certificates: %u\n"
msgstr "permanent innlastede sertifikater: %u\n"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, c-format
msgid " runtime cached certificates: %u\n"
msgstr " hurtiglagrede sertifikater: %u\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
msgid "certificate already cached\n"
msgstr "sertifikat allerede hurtiglagret\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
msgid "certificate cached\n"
msgstr "sertifikat hurtiglagret\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, c-format
msgid "error caching certificate: %s\n"
msgstr "feil under hurtiglagring av sertifikat: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "«%s» er et ugyldig SHA1-fingeravtrykk\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "feil under henting av sertifikat etter S/N: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "feil under henting av sertifikat etter emne: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
msgid "no issuer found in certificate\n"
msgstr "fant ingen utsteder av sertifikat\n"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "feil under henting av «authorityKeyIdentifier»: %s\n"
@@@ -8936,12 -6988,10 +8865,12 @@@ msgstr "åpner hurtiglager-fil «%s»\n
msgid "error opening cache file '%s': %s\n"
msgstr "feil under åpning av hurtiglager-fil «%s»: %s\n"
+#: dirmngr/crlcache.c:1154
#, c-format
msgid "error initializing cache file '%s' for reading: %s\n"
- msgstr "feil under åpning av hurtiglager-fil «%s» for lesing. %s\n"
+ msgstr "feil under åpning av hurtiglager-fil «%s» for lesing: %s\n"
+#: dirmngr/crlcache.c:1175
msgid "calling unlock_db_file on a closed file\n"
msgstr "utfører «unlock_db_file» på en lukket fil\n"
@@@ -9014,17 -7051,14 +8943,17 @@@ msgstr "S/N %s er gyldig, men står ikk
msgid "error getting data from cache file: %s\n"
msgstr "feil under henting av data fra hurtiglager-fil: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, c-format
msgid "unknown hash algorithm '%s'\n"
msgstr "«%s» er en ugyldig summeringsalgoritme\n"
+#: dirmngr/crlcache.c:1549
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
- msgstr "«gcry_md_open» for algoritme %d mislyktes. %s\n"
+ msgstr "«gcry_md_open» for algoritme %d mislyktes: %s\n"
+#: dirmngr/crlcache.c:1586 dirmngr/crlcache.c:1605
msgid "got an invalid S-expression from libksba\n"
msgstr "fikk ugyldig S-uttrykk fra libksba\n"
@@@ -9033,7 -7066,6 +8962,7 @@@
msgid "converting S-expression failed: %s\n"
msgstr "konvertering av S-uttrykk mislyktes: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, c-format
msgid "creating S-expression failed: %s\n"
msgstr "oppretting av S-uttrykk mislyktes: %s\n"
@@@ -9413,113 -7365,82 +9342,109 @@@ msgstr "forventet fullstendig filsti\n
msgid "looking up '%s'\n"
msgstr "slår opp «%s»\n"
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr "kjør som windows-tjeneste (i bakgrunnen)"
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr "vis innhold i CRL-hurtiglager"
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FIL|last inn CRL fra valgt FIL i hurtiglager"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr "|ADR|hent CRL fra valgt nettADResse"
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr "slå av dirmngr"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr "tøm hurtiglager"
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr "|FIL|skriv tjenermodus-logger til valgt FIL"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
msgid "run without asking a user"
msgstr "kjør uten å spørre bruker"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr "tving innlasting av utdatert CRL"
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr "tillat sending av OCSP-forespørsler"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr "hindre bruk av HTTP"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr "hindre bruk av LDAP"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr "ignorer HTTP CRL-distribusjonspunkter"
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr "ignorer LDAP CRL-distribusjonspunkter"
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr "ignorer OSCP-tjenesteadresser som følger sertifikater"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|ADR|videresend alle HTTP-forespørsler til valgt nettADResse"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr "|VERT|bruk valgt VERT til LDAP-oppslag"
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "ikke bruk tilbakefallsverter ved bruk av valget «--ldap-proxy»"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FIL|les LDAP-tjenerliste fra valgt FIL"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
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:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 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:209
++#: dirmngr/dirmngr.c:196
msgid "|URL|use OCSP responder at URL"
msgstr "|ADR|bruk OCSP-svartjeneste ved valgt nettADResse"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|OCSP-svartjeneste signert av FPR"
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
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:222
++#: dirmngr/dirmngr.c:209
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:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr "kjør all nettverkstrafikk gjennom Tor"
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9528,11 -7449,9 +9453,11 @@@ msgstr "
"@\n"
"Se «info»-bruksanvisning for fullstendig liste over alle kommandoer og valg\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Bruk: @DIRMNGR@ [valg] (-h for hjelp)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9540,77 -7459,60 +9465,77 @@@ msgstr "
"Syntaks: @DIRMNGR@ [valg] [kommando [arg]]\n"
"Tilgang til nøkkeltjener, CRL og OCSP for @GNUPG@\n"
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "følgende feilsøkingsnivåer er gyldige: %s\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, c-format
msgid "usage: %s [options] "
msgstr "bruk: %s [valg] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
msgid "colons are not allowed in the socket name\n"
msgstr "kolon tillates ikke i sokkelnavn\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "henting av CRL fra «%s» mislyktes: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "behandling av CRL fra «%s» mislyktes: %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: for lang linje. Hoppet over\n"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: oppdaget ugyldig fingeravtrykk\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: lesefeil: %s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: ignorerer ugyldige data ved linjeslutt\n"
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
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:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr "SIGUSR2 mottatt. Ingen handling definert\n"
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr "SIGTERM mottatt. Slår av …\n"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "SIGTERM mottatt. %d tilkoblinger er fremdeles aktive\n"
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
msgid "shutdown forced\n"
msgstr "slår av under tvang\n"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr "SIGINT mottatt. Slår av umiddelbart\n"
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "signal %d mottatt. Ingen handling definert\n"
@@@ -9780,13 -7646,10 +9705,13 @@@ msgstr "«%s» er ikke en LDAP-adresse\
msgid "'%s' is an invalid LDAP URL\n"
msgstr "«%s» er en ugyldig LDAP-adresse\n"
+#: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
+#: dirmngr/ldap-wrapper.c:693
#, c-format
msgid "error allocating memory: %s\n"
- msgstr "feil under tildeling av minne. %s\n"
+ msgstr "feil under minnetildeling: %s\n"
+#: dirmngr/ldap-wrapper.c:207
#, c-format
msgid "error printing log line: %s\n"
msgstr "feil under utskrift av logglinje: %s\n"
@@@ -9940,98 -7772,77 +9865,98 @@@ msgstr "summering av OCSP-svar for «%s
msgid "not signed by a default OCSP signer's certificate"
msgstr "ikke signert av sertifikat som tilhører en forvalgt OCSP-fullmektig"
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr "OSCP-svar skal bare bruke SHA-1\n"
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, c-format
msgid "allocating list item failed: %s\n"
msgstr "tildeling av listeelement mislyktes: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, c-format
msgid "error getting responder ID: %s\n"
msgstr "feil under henting av svartjeneste-ID: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr "fant ingen sertifikat som egner seg til å bekrefte OCSP-svar\n"
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, c-format
msgid "issuer certificate not found: %s\n"
msgstr "fant ikke utstedersertifikat: %s\n"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr "klient sendte ikke målsertifikat\n"
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
msgid "caller did not return the issuing certificate\n"
msgstr "klient sendte ikke utstedersertifikat\n"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "klarte ikke å tildele OCSP-kontekst: %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, c-format
msgid "can't get authorityInfoAccess: %s\n"
msgstr "klarte ikke å hente «authorityInfoAccess»: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr "ingen forvalgt OCSP-svartjeneste\n"
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
msgid "no default OCSP signer defined\n"
msgstr "ingen OCSP-undertegner er definert som standard\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr "bruker forvalgt OCSP-svartjeneste «%s»\n"
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, c-format
msgid "using OCSP responder '%s'\n"
msgstr "bruker OCSP-svartjeneste «%s»\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr "klarte ikke å sette opp kontrollsum-kontekst for OCSP: %s\n"
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "feil under henting av OCSP-status for målsertifikat: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr "sertifikatstatus er: %s (dette=%s neste=%s)\n"
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr "bra"
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "sertifikat opphevet %s med følgende begrunnelse: %s\n"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr "OCSP-svartjeneste sendte status datert i fremtid\n"
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr "OCSP-svartjeneste sendte status som ikke er datert i nåtid\n"
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr "OCSP-svartjeneste sendte for gammel status\n"
@@@ -10079,32 -7880,26 +10004,32 @@@ msgstr "«fetch_next_cert» mislyktes:
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d overskredet\n"
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "klarte ikke å tildele kontrollstruktur: %s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "klarte ikke å tildele assuan-kontekst: %s\n"
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "klarte ikke å starte opp tjener: %s\n"
- #: dirmngr/server.c:2444
++#: dirmngr/server.c:2406
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "klarte ikke å registrere kommandoer i Assuan: %s\n"
- #: dirmngr/server.c:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan-godkjenningsproblem: %s\n"
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuan-behandling mislyktes: %s\n"
@@@ -10125,32 -7916,22 +10050,28 @@@ msgstr "lar være å kontrollere CRL fo
msgid "checking CRL for"
msgstr "kontrollerer CRL for"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr "kjører i kompatiblitetsmodus. Sertifikatkjede ikke kontrollert.\n"
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
msgid "selfsigned certificate has a BAD signature"
msgstr "selvsignert sertifikat har ugyldig signatur"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "troverdighetssjekk av rotsertifikat mislyktes: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
msgid "certificate chain is good\n"
msgstr "sertifikatkjede er funnet i orden\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA krever kontrollsum på 160 bit\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
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:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
msgid "quiet"
msgstr "stille"
@@@ -10277,11 -8027,11 +10198,13 @@@ msgstr "|N|endre maksimal livstid for S
msgid "Options enforcing a passphrase policy"
msgstr "Valg som håndhever passordfrase-regler"
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ #, fuzzy
+ #| msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr "ikke tillat overstyring av passordfrase-regler"
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|endre minimal passordfrase-lengde til N"
@@@ -10414,67 -8132,51 +10337,67 @@@ msgstr "Ekstern bekreftelse av komponen
msgid "Note that group specifications are ignored\n"
msgstr "Merk at gruppespesifikasjoner blir ignorert\n"
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr "vis alle komponenter"
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr "kontroller alle programmer"
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr "|KOMPONENT|vis valg"
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr "|KOMPONENT|endre valg"
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr "|KOMPONENT|kontroller valg"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr "bruk globale standardverdier"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr "hent oppsettsmapper for @GPGCONF@"
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
msgid "list global configuration file"
msgstr "vis global oppsettsfil"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
msgid "check global configuration file"
msgstr "kontroller global oppsettsfil"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr "last inn én eller alle komponenter på nytt"
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr "last inn valgt komponent"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr "drep valgt komponent"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "bruk som utdatafil"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr "ta i bruk endringer under kjøring, hvis mulig"
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Bruk: @GPGCONF@ [valg] (-h for hjelp)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10482,15 -8184,12 +10405,15 @@@ msgstr "
"Syntaks: @GPGCONF@ [valg]\n"
"Behandle oppsettsvalg for verktøy i @GNUPG at -systemet\n"
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr "Komponent-argument mangler"
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
msgid "Component not found"
msgstr "Fant ikke komponent"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
msgid "No argument allowed"
msgstr "Ingen argumenter tillatt"
@@@ -10542,122 -8232,97 +10465,122 @@@ msgstr "
"[valg …] KOMMANDO [inndatafil]\n"
"Bruk et enkelt symmetrisk krypteringsverktøy\n"
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s på %s avbrøt med status %i\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, c-format
msgid "%s on %s failed with status %i\n"
msgstr "%s på %s mislyktes med status %i\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "klarte ikke å lage midlertidig mappe «%s»: %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr "klarte ikke å åpne %s for skriving: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, c-format
msgid "error writing to %s: %s\n"
msgstr "feil under skriving til %s: %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, c-format
msgid "error reading from %s: %s\n"
msgstr "feil under lesing fra %s: %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, c-format
msgid "error closing %s: %s\n"
msgstr "feil under lukking av %s: %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
msgid "no --program option provided\n"
msgstr "valget «--program» er ikke brukt\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr "programmet støtter bare «--decrypt» og «--encrypt»\n"
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr "valget «--keyfile» mangler\n"
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr "klarte ikke å tildele argumentvektor\n"
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, c-format
msgid "could not create pipe: %s\n"
msgstr "klarte ikke å lage datarør: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, c-format
msgid "could not create pty: %s\n"
msgstr "klarte ikke å lage pty: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr "klarte ikke å lage underprosess: %s\n"
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, c-format
msgid "execv failed: %s\n"
msgstr "«execv» mislyktes: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, c-format
msgid "select failed: %s\n"
msgstr "«select» mislyktes: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, c-format
msgid "read failed: %s\n"
msgstr "«read» mislyktes: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, c-format
msgid "pty read failed: %s\n"
msgstr "«pty»-lesing mislyktes: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, c-format
msgid "waitpid failed: %s\n"
msgstr "«waitpid» mislyktes: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr "underprosess ble avbrutt med status %i\n"
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "klarte ikke å tildele inndatafil-streng: %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "klarte ikke å tildele utdatafil-streng: %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr "du må velge enten %s eller %s\n"
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr "ingen klasse valgt\n"
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, c-format
msgid "class %s is not supported\n"
msgstr "klassen %s støttes ikke\n"
diff --cc po/pl.po
index 643101d,4904ce3..bc55d69
--- a/po/pl.po
+++ b/po/pl.po
@@@ -8,7 -8,6 +8,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg-2.0.20\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2013-05-12 17:25+0200\n"
"Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@@ -111,13 -95,9 +111,13 @@@ msgstr "
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
msgid "Passphrase:"
msgstr "Has�o:"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr "nie pasuj� - prosz� spr�bowa� jeszcze raz"
@@@ -157,67 -129,45 +157,67 @@@ msgstr "Niepoprawny PIN
msgid "Bad Passphrase"
msgstr "Niepoprawne has�o"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "klucze ssh wi�ksze ni� %d bit�w nie s� obs�ugiwane\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, 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:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
msgstr "nie mo�na otworzy� ,,%s'': %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "b��d pobierania numeru seryjnego karty: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "wykryto kart� o numerze seryjnym: %s\n"
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, fuzzy, c-format
#| msgid "error getting default authentication keyID of card: %s\n"
msgid "no authentication key for ssh on card: %s\n"
msgstr "b��d pobierania domy�lnego keyID uwierzytelnienia karty: %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "nie znaleziono pasuj�cego klucza karty: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, c-format
msgid "shadowing the key failed: %s\n"
msgstr "zaciemnienie klucza nie powiod�o si�: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, c-format
msgid "error writing key: %s\n"
msgstr "b��d zapisu klucza: %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -225,24 -175,19 +225,24 @@@
msgstr ""
"Proces ssh zarz�da� u�ycia klucza%%0a %s%%0A (%s)%%0ACzy zezwoli� na to?"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr "Zgoda"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr "Odmowa"
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Prosz� wprowadzi� has�o dla klucza ssh%%0A %F%%0A (%c)"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Prosz� ponownie wprowadzi� to has�o"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -251,7 -196,6 +251,7 @@@ msgstr "
"Prosz� wprowadzi� has�o do zabezpieczenia odebranego klucza tajnego%%0A %s"
"%%0A %s%%0Aw miejscu przechowywania kluczy gpg-agenta"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "nie uda�o si� utworzy� strumienia z gniazda: %s\n"
@@@ -411,8 -329,6 +411,8 @@@ msgstr "Prosz� wprowadzi� has�o do%0Aza
msgid "Please enter the new passphrase"
msgstr "Prosz� wprowadzi� nowe has�o"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -420,136 -336,98 +420,136 @@@ msgstr "
"@Opcje:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr "uruchomienie w trybie demona (w tle)"
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "z dodatkowymi informacjami"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "mniej komunikat�w"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr "wyj�cie polece� w stylu sh"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr "wyj�cie polece� w stylu csh"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|PLIK|odczyt opcji z PLIKU"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr "nie odczepianie od konsoli"
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr "nie przechwytywanie klawiatury i myszy"
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "u�ycie pliku loga dla serwera"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|u�ycie PGM jako programu do wprowadzania PIN-u"
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|u�ycie PGM jako programu SCdaemon"
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
msgid "do not use the SCdaemon"
msgstr "nie u�ywanie SCdaemona"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, 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:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr "ignorowanie ��da� zmiany TTY"
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr "ignorowanie ��da� zmiany ekranu X"
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|przedawnienie pami�tanych PIN-�w po N sekundach"
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr "nie u�ywanie pami�ci PIN-�w przy podpisywaniu"
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, 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:220
++#: agent/gpg-agent.c:219
#, 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:223
++#: agent/gpg-agent.c:222
msgid "allow presetting passphrase"
msgstr "zezwolenie na predefiniowane has�o"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
msgid "enable ssh support"
msgstr ""
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "B��dy prosimy zg�asza� na adres <@EMAIL@>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
#, 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:484
++#: agent/gpg-agent.c:483
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -561,120 -439,85 +561,112 @@@ msgstr "
"Sk�adnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
"Zarz�dzanie kluczem tajnym dla GnuPG\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, 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:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr "biblioteka %s jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "plik opcji ,,%s'': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, 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:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, c-format
msgid "can't create socket: %s\n"
msgstr "nie mo�na utworzy� gniazda: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, 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:1844
++#: agent/gpg-agent.c:1843
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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
msgid "error getting nonce for the socket\n"
msgstr "b��d podczas pobierania nonce z gniazda\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, 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:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, 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:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() nie powiod�o si�: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, 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:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, 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:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
msgstr "katalog ,,%s'' utworzony\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, 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:1958
++#: agent/gpg-agent.c:1957
#, 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:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "b��d odczytu nonce z fd %d: %s\n"
@@@ -689,29 -530,23 +681,29 @@@ msgstr "obs�uga 0x%lx dla fd %d uruchom
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "obs�uga 0x%lx dla fd %d zako�czona\n"
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, 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:2390
++#: agent/gpg-agent.c:2392
#, 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:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, 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:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s zatrzymany\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "brak dzia�aj�cego gpg-agenta w tej sesji\n"
@@@ -728,8 -561,6 +720,8 @@@ msgstr "
"Sk�adnia: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA\n"
"Utrzymuwanie pami�ci hase�\n"
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -737,9 -568,6 +729,9 @@@ msgstr "
"@Polecenia:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -761,22 -587,18 +753,22 @@@ msgstr "
"Sk�adnia: gpg-protect-tool [opcje] [argumenty]\n"
"Narz�dzie do utrzymywania kluczy tajnych\n"
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Prosz� wprowadzi� has�o do odbezpieczenia obiektu PKCS#12."
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Prosz� wprowadzi� has�o do zabezpieczenia obiektu PKCS#12."
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
"Prosz� wprowadzi� has�o do zabezpieczenia wa�nego obiektu w systemie GnuPG."
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -784,16 -606,13 +776,16 @@@ msgstr "
"Prosz� wprowadzi� has�o lub PIN\n"
"Potrzebny do zako�czenia tej operacji."
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
msgid "cancelled\n"
msgstr "anulowano\n"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -976,46 -766,34 +968,46 @@@ msgstr "algorytm ochrony %d%s nie jest
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "b��d tworzenia potoku: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error creating a stream for a pipe: %s\n"
msgstr "b��d tworzenia potoku: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, c-format
msgid "error forking process: %s\n"
msgstr "b��d podczas tworzenia procesu: %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
#| msgid "waiting for process %d to terminate failed: %s\n"
msgid "waiting for processes to terminate failed: %s\n"
msgstr "oczekiwanie na zako�czenie procesu %d nie powiod�o si�: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, fuzzy, c-format
#| msgid "error running `%s': probably not installed\n"
msgid "error running '%s': probably not installed\n"
msgstr "b��d uruchamiania ,,%s'': prawdopodobnie nie zainstalowany\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
#| msgid "error running `%s': exit status %d\n"
msgid "error running '%s': exit status %d\n"
msgstr "b��d uruchamiania ,,%s'': kod wyj�cia %d\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, fuzzy, c-format
#| msgid "error running `%s': terminated\n"
msgid "error running '%s': terminated\n"
@@@ -1031,35 -807,14 +1023,17 @@@ msgstr "b��d odczytu kodu zako�czenia p
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "oczekiwanie na zako�czenie procesu %d nie powiod�o si�: %s\n"
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "problem z komunikacj� z gpg-agentem\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
msgid "problem setting the gpg-agent options\n"
msgstr "problem z ustawieniem opcji gpg-agenta\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- msgid "canceled by user\n"
- msgstr "anulowano przez u�ytkownika\n"
-
- #: common/simple-pwquery.c:579
- msgid "problem with the agent\n"
- msgstr "problem z agentem\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- #| msgid "problem with the agent: %s\n"
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "problem z agentem: %s\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "nie mo�na wy��czy� zrzut�w pami�ci: %s\n"
@@@ -1145,7 -883,6 +1119,7 @@@ msgstr "%s:%u: przestarza�a opcja ,,%s'
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj� - nie ma efektu\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1172,19 -905,16 +1146,19 @@@ msgstr "
msgid "connection to agent is in restricted mode\n"
msgstr "nie mo�na po��czy� si� z dirmngr - pr�ba fallbacku\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, fuzzy, c-format
#| msgid "no running dirmngr - starting `%s'\n"
msgid "no running Dirmngr - starting '%s'\n"
msgstr "dirmngr nie dzia�a - uruchamianie ,,%s''\n"
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, fuzzy, c-format
#| msgid "waiting %d seconds for the agent to come up\n"
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "oczekiwanie (%d s) na uruchomienie agenta\n"
- #: common/asshelp.c:672
++#: common/asshelp.c:639
#, fuzzy
#| msgid "can't connect to the dirmngr - trying fall back\n"
msgid "connection to the dirmngr established\n"
@@@ -1448,7 -1118,6 +1422,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:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
msgid "out of core\n"
msgstr "brak pami�ci\n"
@@@ -1511,7 -1169,10 +1485,13 @@@ msgstr "blokada ,,%s'' nie za�o�ona: %s
msgid "waiting for lock %s...\n"
msgstr "oczekiwanie na blokad� %s...\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr "biblioteka %s jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "opakowanie: %s\n"
@@@ -1753,10 -1359,6 +1733,10 @@@ msgstr "URL do odczytania klucza public
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "B��d: URL zbyt d�ugi (limit to %d znak�w).\n"
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
@@@ -2055,27 -1592,18 +2035,27 @@@ msgstr "Polecenia dla administratora ni
msgid "Invalid command (try \"help\")\n"
msgstr "Niepoprawne polecenie (spr�buj ,,help'')\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "opcja --output nie dzia�a z tym poleceniem\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "nie mo�na otworzy� ,,%s''\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "b��d odczytu bloku kluczy: %s\n"
@@@ -2136,40 -1652,33 +2116,40 @@@ msgstr "dla klucza publicznego ,,%s'' i
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "aby go usun�� nale�y najpierw u�y� opcji \"--delete-secret-key\".\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "b��d podczas tworzenia has�a: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr ""
"ustawiony tryb S2K nie pozwala u�y� pakietu ESK dla szyfru symetrycznego\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "szyfrem %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr ",,%s'' ju� jest skompresowany\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "OSTRZE�ENIE: plik ,,%s'' jest pusty\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "odczyt z ,,%s''\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2177,7 -1686,6 +2157,7 @@@ msgstr "
"OSTRZE�ENIE: wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami "
"adresata\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2186,17 -1694,14 +2166,17 @@@ msgstr "
"OSTRZE�ENIE: wymuszone u�ycie kompresji %s (%d) k��ci si� z ustawieniami "
"adresata\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "%s nie jest dost�pne w trybie %s\n"
@@@ -2305,8 -1789,6 +2285,8 @@@ msgstr "usuni�cie jak najwi�kszej cz�c
msgid " - skipped"
msgstr "%s: pomini�ty: %s\n"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2341,8 -1816,6 +2321,8 @@@ msgstr "b��d tworzenia ,,%s'': %s\n
msgid "[User ID not found]"
msgstr "[brak identyfikatora u�ytkownika]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
@@@ -2415,211 -1875,162 +2395,211 @@@ msgstr "
msgid "using subkey %s instead of primary key %s\n"
msgstr "u�ywany jest podklucz %s zamiast klucza g��wnego %s\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
msgid "make a signature"
msgstr "z�o�enie podpisu"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
msgid "make a clear text signature"
msgstr "z�o�enie podpisu pod dokumentem"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "z�o�enie podpisu oddzielonego od dokumentu"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "szyfrowanie danych"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "szyfrowanie tylko szyfrem symetrycznym"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "odszyfrowywanie danych (domy�lne)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "sprawdzenie podpisu"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "lista kluczy"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "lista kluczy i podpis�w"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "list and check key signatures"
msgstr "wypisanie i sprawdzenie podpis�w kluczy"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "lista kluczy i ich odcisk�w"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "lista kluczy prywatnych"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "tworzenie certyfikatu uniewa�nienia klucza"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "z�o�enie podpisu na kluczu"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "z�o�enie prywatnego podpisu na kluczu"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "z�o�enie podpisu na kluczu"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "z�o�enie prywatnego podpisu na kluczu"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "podpisanie lub modyfikacja klucza"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "zmiana has�a"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "eksport kluczy do pliku"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "eksport kluczy do serwera kluczy"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "import kluczy z serwera kluczy"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "szukanie kluczy na serwerze"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "od�wie�enie wszystkich kluczy z serwera"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "import/do��czenie kluczy"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr "wy�wietlenie stanu karty"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr "zmiana danych na karcie"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr "zmiana PIN-u karty"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "uaktualnienie bazy zaufania"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
msgid "print message digests"
msgstr "wypisanie skr�t�w wiadomo�ci"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "uruchomienie w trybie serwera"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "opakowanie ASCII pliku wynikowego"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|U�YTKOWNIK|szyfrowanie dla odbiorcy o tym identyfikatorze"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"|U�YTKOWNIK|u�ycie tego identyfikatora u�ytkownika do podpisania lub "
"odszyfrowania"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|ustawienie poziomu kompresji N (0 - bez)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "kanoniczny format tekstowy"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|PLIK|zapis wyj�cia do PLIKU"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "pozostawienie bez zmian"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "pytanie przed nadpisaniem plik�w"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr "�cis�e zachowanie OpenPGP"
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2627,7 -2038,6 +2607,7 @@@ msgstr "
"@\n"
"(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2649,13 -2059,11 +2629,13 @@@ msgstr "
" --list-keys [nazwy] pokazanie klucze\n"
" --fingerprint [nazwy] pokazanie odcisk�w kluczy\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2670,7 -2078,6 +2650,7 @@@ msgstr "
"Podpisywanie, sprawdzanie podpis�w, szyfrowanie, rozszyfrowywanie\n"
"Domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2678,78 -2085,64 +2658,78 @@@ msgstr "
"\n"
"Obs�ugiwane algorytmy:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "Asymetryczne: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Symetryczne: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Skr�t�w: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Kompresji: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "wywo�anie: gpgsm [opcje]"
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "sprzeczne polecenia\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, fuzzy, c-format
#| msgid "no = sign found in group definition `%s'\n"
msgid "no = sign found in group definition '%s'\n"
msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu domowego ,,%s''\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do pliku konfiguracyjnego ,,%s''\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on extension `%s'\n"
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do rozszerzenia ,,%s''\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu domowego ,,%s''\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do pliku konfiguracyjnego ,,%s''\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on extension `%s'\n"
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do rozszerzenia ,,%s''\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@@ -2757,7 -2150,6 +2737,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego katalog "
"domowy ,,%s''\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2767,7 -2159,6 +2747,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego plik "
"konfiguracyjny ,,%s''\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@@ -2775,7 -2166,6 +2755,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego "
"rozszerzenie ,,%s''\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@@ -2783,7 -2173,6 +2763,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego katalog "
"domowy ,,%s''\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2794,7 -2183,6 +2774,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego plik "
"konfiguracyjny ,,%s''\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@@ -2802,517 -2190,401 +2782,511 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego "
"rozszerzenie ,,%s''\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr "wy�wietlenie ID zdj�� przy wypisywaniu kluczy"
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
#, fuzzy
#| msgid "show user ID validity during key listings"
msgid "show key usage information during key listings"
msgstr "pokazywanie poprawno�ci ID u�ytkownika przy wypisywaniu kluczy"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr "pokazywanie URL-i polityk przy wypisywaniu podpis�w"
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
msgid "show all notations during signature listings"
msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpis�w"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpis�w"
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr "pokazywanie adnotacji u�ytkownika przy wypisywaniu podpis�w"
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"pokazywanie URL-i preferowanych serwer�w kluczy przy wypisywaniu podpis�w"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr "pokazywanie poprawno�ci ID u�ytkownika przy wypisywaniu kluczy"
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr ""
"pokazywanie uniewa�nionych i wygas�ych ID u�ytkownika na listach kluczy"
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr "pokazywanie uniewa�nionych i wygas�ych podkluczy na listach kluczy"
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
msgid "show the keyring name in key listings"
msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
msgid "show expiration dates during signature listings"
msgstr "pokazywanie dat wyga�ni�cia przy wypisywaniu podpis�w"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "Dost�pne klucze:\n"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "nieznana opcja ,,%s''\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- #| msgid "unknown command `%s'\n"
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "nieznane polecenie ,,%s''\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, fuzzy, c-format
#| msgid "NOTE: old default options file `%s' ignored\n"
msgid "Note: old default options file '%s' ignored\n"
msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr ""
- "biblioteka libgcrypt jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, fuzzy, c-format
#| msgid "`%s' is not a valid signature expiration\n"
msgid "'%s' is not a valid signature expiration\n"
msgstr ",,%s'' nie jest poprawnym czasem wyga�ni�cia podpisu\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ #| msgid "line %d: not a valid email address\n"
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "linia %d: niepoprawny adres e-mail\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, fuzzy, c-format
#| msgid "invalid country code in `%s', line %d\n"
msgid "invalid pinentry mode '%s'\n"
msgstr "niew�a�ciwy kod kraju w ,,%s'', w linii %d\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, fuzzy, c-format
#| msgid "`%s' is not a valid character set\n"
msgid "'%s' is not a valid character set\n"
msgstr ",,%s'' nie jest poprawn� nazw� zestawu znak�w\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "niezrozumia�y URL serwera kluczy\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
msgid "invalid keyserver options\n"
msgstr "niepoprawne opcje serwera kluczy\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "niepoprawne opcje wczytania kluczy\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "niepoprawne opcje wypisywania\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "niepoprawne opcje eksportu kluczy\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: niepoprawne opcje wypisywania\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
msgid "invalid list options\n"
msgstr "niepoprawne opcje wypisywania\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr "wy�wietlanie ID zdj�� przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
msgid "show all notations during signature verification"
msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr "pokazywanie adnotacji u�ytkownika przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"pokazywanie URL-i preferowanych serwer�w kluczy przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
msgid "show user ID validity during signature verification"
msgstr "pokazywanie poprawno�ci ID u�ytkownika przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"pokazywanie uniewa�nionych i wygas�ych ID u�ytkownika przy sprawdzaniu "
"podpis�w"
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
msgid "show only the primary user ID in signature verification"
msgstr "pokazywanie tylko g��wnego ID u�ytkownika przy sprawdzaniu podpisu"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr "sprawdzanie podpis�w z danymi PKA"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr "zwi�kszenie zaufania podpis�w z poprawnymi danymi PKA"
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
msgid "invalid verify options\n"
msgstr "niepoprawne opcje sprawdzania\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nie mo�na ustawi� �cie�ki program�w wykonywalnych na %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr "Niepoprawna lista auto-key-locate\n"
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie wolno u�ywa� %s z %s!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nie ma sensu w po��czeniu z %s!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr "OSTRZE�ENIE: dzia�anie z fa�szywym czasem systemowym: "
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "nie zadzia�a z niebezpieczn� pami�ci� z powodu %s\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
msgid "selected compression algorithm is invalid\n"
msgstr "wybrany algorytm kompresji jest niepoprawny\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr ""
"niew�a�ciwy domy�lny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr ""
"niew�a�ciwy minimalny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "niew�a�ciwe domy�lne ustawienia\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "niew�a�ciwe ustawienia szyfr�w\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "niew�a�ciwe ustawienia skr�t�w\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s jeszcze nie dzia�a z %s!\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, fuzzy, c-format
#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "szyfr ,,%s'' nie jest dost�pny w trybie %s\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, fuzzy, c-format
#| msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "skr�t ,,%s'' nie jest dost�pny w trybie %s\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, fuzzy, c-format
#| msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "kompresja ,,%s'' nie jest dost�pna w trybie %s\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "OSTRZE�ENIE: podano adresat�w (-r) w dzia�aniu kt�re ich nie dotyczy\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [plik]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [plik]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, fuzzy, c-format
#| msgid "symmetric encryption of `%s' failed: %s\n"
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "szyfrowanie symetryczne ,,%s'' nie powiod�o si�: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [plik]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [plik]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "nie mo�na u�y� --symmetric --encrypt wraz z --s2k-mode 0\n"
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "nie mo�na u�y� --symmetric --encrypt w trybie %s\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [plik]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [plik]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [plik]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "nie mo�na u�y� --symmetric --sign --encrypt wraz z --s2k-mode 0\n"
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "nie mo�na u�y� --symmetric --sign --encrypt w trybie %s\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [plik]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [plik]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [plik]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key nazwa u�ytkownika"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key nazwa u�ytkownika"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key nazwa u�ytkownika [polecenia]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
msgid "--passwd <user-id>"
msgstr "--passwd <id-u�ytkownika>"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "eksport kluczy nie powi�d� si�: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "eksport kluczy nie powi�d� si�: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "niew�a�ciwy algorytm skr�tu ,,%s''\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error parsing key specification '%s': %s\n"
msgstr "b��d zapisywania certyfikatu: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[nazwa pliku]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
msgid "the given preferred keyserver URL is invalid\n"
msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
@@@ -3354,138 -2618,110 +3328,138 @@@ msgstr "Pomoc niedost�pna
msgid "No help available for '%s'"
msgstr "Brak pomocy o ,,%s''"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr "import podpis�w oznaczonych jako tylko lokalne"
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr "naprawienie uszkodze� z serwera pks przy imporcie"
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "nie uaktualnianie bazy zaufania po imporcie"
- #: g10/import.c:143
++#: g10/import.c:147
msgid "do not update the trustdb after import"
msgstr "nie uaktualnianie bazy zaufania po imporcie"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "okazanie odcisku klucza"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr "przyjmowanie tylko uaktualnie� istniej�cych kluczy"
- #: g10/import.c:152
++#: g10/import.c:156
msgid "remove unusable parts from key after import"
msgstr "usuwanie bezu�ytecznych cz�ci kluczy po imporcie"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr "usuwanie jak najwi�kszej cz�ci kluczy po imporcie"
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "blok typu %d zostaje pomini�ty\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu kluczy przetworzonych do tej chwili\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Og�em przetworzonych kluczy: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " pomini�tych nowych kluczy: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " pomini�tych nowych kluczy: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " bez identyfikatora: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " do��czono do zbioru: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " bez zmian: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nowych identyfikator�w: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nowych podkluczy: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " nowych podpis�w: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nowych uniewa�nie� kluczy: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " tajnych kluczy wczytanych: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " tajnych kluczy dodanych: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " tajnych kluczy bez zmian: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " nie w��czono do zbioru: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " podpis�w wyczyszczonych: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr "ID u�ytkownika wyczyszczonych: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3494,193 -2730,155 +3468,193 @@@ msgstr "
"OSTRZE�ENIE: klucz %s zawiera preferencje dla niedost�pnych\n"
"algorytm�w dla tych ID u�ytkownika:\n"
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " ,,%s'': preferowany szyfr %s\n"
- #: g10/import.c:1042
++#: g10/import.c:1048
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " ,,%s'': preferowany algorytm skr�tu %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " ,,%s'': preferowany algorytm kompresji %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "zdecydowanie sugerowane jest uaktualnienie ustawie� i ponowne\n"
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "rozes�anie tego klucza w celu unikni�cia niezgodno�ci algorytm�w\n"
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"mo�na uaktualni� swoje ustawienia poprzez: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, c-format
msgid "key %s: no user ID\n"
msgstr "klucz %s: brak identyfikatora u�ytkownika\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "pomini�ty ,,%s'': %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1264
++#: g10/import.c:1343
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "klucz %s: podklucz uszkodzony przez serwer zosta� naprawiony\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "klucz %s: przyj�to identyfikator nie podpisany nim samym ,,%s''\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "klucz %s: brak poprawnych identyfikator�w u�ytkownika\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "to mo�e by� spowodowane brakiem podpisu klucza nim samym\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "klucz %s: brak klucza publicznego: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "klucz %s: nowy klucz - pomini�ty\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "b��d zapisu zbioru kluczy ,,%s'': %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "klucz %s: klucz publiczny ,,%s'' wczytano do zbioru\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "klucz %s: nie zgadza si� z lokaln� kopi�\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "klucz %s: brak oryginalnego bloku klucza; %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "klucz %s: nie mo�na odczyta� oryginalnego bloku klucza: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "klucz %s: ,,%s'' 1 nowy identyfikator u�ytkownika\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "klucz %s: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "klucz %s: ,,%s'' 1 nowy podpis\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "klucz %s: ,,%s'' %d nowych podpis�w\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "klucz %s: ,,%s'' 1 nowy podklucz\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "klucz %s: ,,%s'' %d nowych podkluczy\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "klucz %s: ,,%s'' %d podpis wyczyszczony\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "klucz %s: ,,%s'' %d podpis�w wyczyszczonych\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "klucz %s: ,,%s'' %d identyfikator u�ytkownika wyczyszczony\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "klucz %s: ,,%s'' %d identyfikator�w u�ytkownika wyczyszczonych\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "klucz %s: ,,%s'' bez zmian\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, c-format
msgid "key %s: secret key imported\n"
msgstr "klucz %s: klucz tajny wczytany do zbioru\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "key %s: error sending to agent: %s\n"
msgstr "b��d wysy�ania polecenia %s: %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key %s: %s\n"
msgstr "klucz prywatny ,,%s'' nie zosta� odnaleziony: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
msgid "importing secret keys not allowed\n"
msgstr "wczytywanie kluczy tajnych nie jest dozwolone\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "klucz %s: klucz tajny z b��dnym szyfrem %d - pomini�ty\n"
@@@ -3695,145 -2893,118 +3669,145 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"klucz %s: brak klucza publicznego kt�rego dotyczy wczytany certyfikat\n"
" uniewa�nienia\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "klucz %s: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "klucz %s: ,,%s'' certyfikat uniewa�nienia zosta� ju� wczytany\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "klucz %s: brak identyfikatora u�ytkownika do podpisu\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "klucz %s: algorytm asymetryczny dla id ,,%s'' nie jest obs�ugiwany\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "klucz %s: niepoprawny podpis na identyfikatorze ,,%s''\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "klucz %s: nieobs�ugiwany algorytm asymetryczny\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "klucz %s: nieprawid�owy bezpo�redni podpis\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "klucz %s: brak podklucza do dowi�zania\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "klucz %s: niepoprawne dowi�zanie podklucza\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "klucz %s: usuni�to wielokrotne dowi�zanie podklucza\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "klucz %s: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "klucz %s: niepoprawne uniewa�nienie podklucza\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "klucz %s: usuni�to wielokrotne uniewa�nienie podklucza\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "klucz %s: pomini�to identyfikator u�ytkownika ,,%s''\n"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "klucz %s: podklucz pomini�ty\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "klucz %s: podpis nieeksportowalny (klasy 0x%02X) - pomini�ty\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr ""
"klucz %s: pomini�to certyfikat uniewa�nienia umieszczony\n"
" w niew�a�ciwym miejscu\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "klucz %s: pomini�to - niepoprawny certyfikat uniewa�nienia: %s\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "klucz %s: pomini�to - podpis na podkluczu w niew�a�ciwym miejscu\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "klucz %s: pomini�to - nieoczekiwana klasa podpisu (0x%02X)\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "key %s: do��czono powt�rzony identyfikator u�ytkownika\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"OSTRZE�ENIE: klucz %s m�g� zosta� uniewa�niony:\n"
" zapytanie o uniewa�niaj�cy klucz %s w serwerze kluczy\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"OSTRZE�ENIE: klucz %s m�g� zosta� uniewa�niony:\n"
" brak uniewa�niaj�cego klucza %s.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "klucz %s: ,,%s'' dodany certyfikat uniewa�nienia\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "klucz %s: dodano bezpo�redni podpis\n"
@@@ -4186,8 -3295,6 +4160,8 @@@ msgstr "To�samo�� u�ytkownika zosta�a d
msgid "Really sign? (y/N) "
msgstr "Czy na pewno podpisa�? (t/N) "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
@@@ -4670,13 -3675,9 +4644,13 @@@ msgstr "
"Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
"dop�ki program nie zostanie uruchomiony ponownie.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
msgid "revoked"
msgstr "uniewa�niony"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "wygas�"
@@@ -5646,13 -4469,11 +5620,13 @@@ msgstr " Odcisk klucza =
msgid " Card serial no. ="
msgstr " Nr seryjny karty ="
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "buforowanie zbioru kluczy ,,%s''\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5661,7 -4482,6 +5635,7 @@@ msgstr[0] "%lu kluczy zbuforowano do te
msgstr[1] "%lu kluczy zbuforowano do tej pory (%lu podpis�w)\n"
msgstr[2] "%lu kluczy zbuforowano do tej pory (%lu podpis�w)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
@@@ -5669,7 -4489,6 +5643,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5678,7 -4497,6 +5652,7 @@@ msgstr[0] "1 niepoprawny podpis\n
msgstr[1] "1 niepoprawny podpis\n"
msgstr[2] "1 niepoprawny podpis\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: zbi�r kluczy utworzony\n"
@@@ -5898,117 -4671,98 +5872,123 @@@ msgstr "
msgid "no signature found\n"
msgstr "nie znaleziono podpisu\n"
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, c-format
msgid "BAD signature from \"%s\""
msgstr "NIEPOPRAWNY podpis z�o�ony przez ,,%s''"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Przeterminowany podpis z�o�ony przez ,,%s''"
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, c-format
msgid "Good signature from \"%s\""
msgstr "Poprawny podpis z�o�ony przez ,,%s''"
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
msgid "can't handle this ambiguous signature data\n"
msgstr "nie mo�na obs�u�y� tych wieloznacznych danych podpisu\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, c-format
msgid "Signature made %s\n"
msgstr "Podpisano w %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, c-format
msgid " using %s key %s\n"
msgstr " przy u�yciu klucza %s %s\n"
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Podpisano w %s kluczem %s o numerze %s\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ #| msgid " aka \"%s\""
+ msgid " issuer \"%s\"\n"
+ msgstr " alias ,,%s''"
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "Klucz dost�pny w: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[niepewne]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, c-format
msgid " aka \"%s\""
msgstr " alias ,,%s''"
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "Wa�no�� podpisu wygas�a %s.\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "Wa�no�� podpisu wygasa %s.\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "podpis %s, skr�t %s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "binarny"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "tekstowy"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "nieznany"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algorytm: %s"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "nie jest oddzielonym podpisem.\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"OSTRZE�ENIE: wielokrotne podpisy. Tylko pierwszy zostanie sprawdzony.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "oddzielony podpis klasy 0x%02x.\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis starego typu (PGP 2.x).\n"
@@@ -6200,94 -4919,50 +6180,61 @@@ msgstr "
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, c-format
msgid "problem with the agent: %s\n"
msgstr "problem z agentem: %s\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, c-format
- msgid " (main key ID %s)"
- msgstr " (ID g��wnego klucza %s)"
-
- #: g10/passphrase.c:277
- #, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Musisz poda� has�o, aby odbezpieczy� klucz tajny certyfikatu OpenPGP:\n"
- ",,%.*s''.\n"
- "Klucz o d�ugo�ci %u bit�w, typ %s, ID %s,\n"
- "stworzony %s%s.\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Has�o\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "anulowano przez u�ytkownika\n"
- #: g10/passphrase.c:483
- #, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "Musisz poda� has�o aby odbezpieczy� klucz prywatny u�ytkownika:\n"
- ",,%s''\n"
-
- #: g10/passphrase.c:491
- #, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "d�ugo�� %u bit�w, typ %s, numer %s, stworzony %s"
-
- #: g10/passphrase.c:500
++#: g10/passphrase.c:489
#, c-format
- msgid " (subkey on main key ID %s)"
- msgstr " (podklucz dla g��wnego klucza o ID %s)"
+ msgid " (main key ID %s)"
+ msgstr " (ID g��wnego klucza %s)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
#, fuzzy
#| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Prosz� wprowadzi� has�o do odbezpieczenia obiektu PKCS#12."
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Prosz� wprowadzi� has�o do zabezpieczenia obiektu PKCS#12."
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Prosz� wprowadzi� has�o do zabezpieczenia obiektu PKCS#12."
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Prosz� wprowadzi� has�o do zabezpieczenia obiektu PKCS#12."
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Czy na pewno chcesz usun�� wybrane klucze? (t/N) "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Czy na pewno chcesz usun�� wybrane klucze? (t/N) "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, fuzzy, c-format
#| msgid "%u-bit %s key, ID %s, created %s"
msgid ""
@@@ -6481,134 -5121,107 +6428,134 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "U�y� tego klucza pomimo to? (t/N) "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "OSTRZE�ENIE: u�ywany jest klucz nie obdarzony zaufaniem!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr ""
"OSTRZE�ENIE: ten klucz m�g� zosta� uniewa�niony\n"
" (brak klucza uniewa�niaj�cego aby to sprawdzi�)\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony kluczem uniewa�niaj�cym!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony przez w�a�ciciela!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
msgid " This could mean that the signature is forged.\n"
msgstr " To mo�e oznacza�, �e podpis jest fa�szerstwem.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "OSTRZE�ENIE: Ten podklucz zosta� uniewa�niony przez w�a�ciciela!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Uwaga: Ten klucz zosta� wy��czony z u�ytku.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, fuzzy, c-format
#| msgid "Note: Verified signer's address is `%s'\n"
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Uwaga: Sprawdzony adres pospisuj�cego to `%s'\n"
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, fuzzy, c-format
#| msgid "Note: Signer's address `%s' does not match DNS entry\n"
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "Uwaga: Adres podpisuj�cego `%s' nie pasuje do wpisu DNS\n"
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
"poziom zaufania poprawiony na PE�NY ze wzgl�du na poprawne informacje PKA\n"
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
"poziom zaufania poprawiony na �ADEN ze wzgl�du na b��dne informacje PKA\n"
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Uwaga: Data wa�no�ci tego klucza up�yn�a!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "OSTRZE�ENIE: Ten klucz nie jest po�wiadczony zaufanym podpisem!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a podpis.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "OSTRZE�ENIE: NIE UFAMY temu kluczowi!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " Ten podpis prawdopodobnie jest FA�SZYWY.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"OSTRZE�ENIE: Tego klucza nie po�wiadczaj� wystarczaj�co zaufane podpisy!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr ""
" Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a ten "
"podpis.\n"
- #: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: pomini�ty: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, 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:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: pomini�ty: zosta� ju� wybrany w innej opcji\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, 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:991
++#: g10/pkclist.c:995
#, 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:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr "Aktualni odbiorcy:\n"
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6616,37 -5229,29 +6563,37 @@@ msgstr "
"\n"
"Identyfikator u�ytkownika (pusta linia oznacza koniec): "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Brak takiego identyfikatora u�ytkownika.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
msgid "skipped: public key already set as default recipient\n"
msgstr "pomini�ty: klucz publiczny ju� jest domy�lnym adresatem\n"
- #: g10/pkclist.c:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "Klucz publiczny wy��czony z u�ycia.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "pomini�ty: zosta� ju� wybrany w innej opcji\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "nieznany domy�lny adresat ,,%s''\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "brak poprawnych adresat�w\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Uwaga: klucz %s nie ma cechy %s\n"
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Uwaga: klucz %s nie ma preferencji dla %s\n"
@@@ -6939,7 -5492,6 +6886,7 @@@ msgstr[0] "klucz publiczny %s jest o %l
msgstr[1] "klucz publiczny %s jest o %lu sekund� m�odszy od podpisu\n"
msgstr[2] "klucz publiczny %s jest o %lu sekund� m�odszy od podpisu\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -7027,12 -5570,10 +6974,12 @@@ msgstr "
"OSTRZE�ENIE: nie mo�na rozwin�� znacznik�w %% w URL-u preferowanego\n"
" serwera kluczy (jest zbyt d�ugi). U�yty zostanie nie rozwini�ty.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "podpis %s/%s z�o�ony przez: ,,%s''\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -7040,11 -5581,9 +6987,11 @@@ msgstr "
"OSTRZE�ENIE: wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami "
"adresata\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "podpis:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "zostanie u�yty szyfr %s\n"
@@@ -7154,7 -5673,6 +7101,7 @@@ msgstr "zbyt du�e zlecenie dla bazy zau
msgid "%s: directory does not exist!\n"
msgstr "%s: katalog nie istnieje!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7266,109 -5762,83 +7213,101 @@@ msgstr "nie mo�na obs�u�y� linii tekst
msgid "input line longer than %d characters\n"
msgstr "linia d�u�sza ni� %d znak�w\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "b��d wysy�ania standardowych opcji: %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "nieobs�ugiwany algorytm: %s"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "b��d wysy�ania polecenia %s: %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: b��d zapisu wpisu katalogowego: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "b��d podczas otwierania ,,%s'': %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "b��d wysy�ania polecenia %s: %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "b��d podczas odczytu nowego PIN-u: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "poprawno��: %s"
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "b��d pobierania zapisanych flag: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, 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"
@@@ -7376,18 -5846,15 +7315,18 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "lista kluczy"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
@@@ -7395,7 -5862,6 +7334,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%ld message signed"
@@@ -7404,7 -5870,6 +7343,7 @@@ msgstr[0] "wypisanie skr�t�w wiadomo�ci
msgstr[1] "wypisanie skr�t�w wiadomo�ci"
msgstr[2] "wypisanie skr�t�w wiadomo�ci"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
@@@ -7412,7 -5877,6 +7351,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
@@@ -7420,7 -5884,6 +7359,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7431,28 -5894,23 +7370,28 @@@ msgstr[2] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
#| msgid "error storing flags: %s\n"
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "b��d zapisywania flag: %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
@@@ -7460,7 -5918,6 +7399,7 @@@ msgstr "b��d tworzenia potoku: %s\n
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
@@@ -7468,7 -5925,6 +7407,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
@@@ -7476,7 -5932,6 +7415,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
@@@ -7484,7 -5939,6 +7423,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
@@@ -7492,7 -5946,6 +7431,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
@@@ -7500,7 -5953,6 +7439,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
@@@ -7508,25 -5960,21 +7447,25 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %ld messages signed by \"%s\"."
msgstr "wypisanie skr�t�w wiadomo�ci"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7538,20 -5986,16 +7477,20 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7569,8 -6013,6 +7508,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error opening TOFU database: %s\n"
@@@ -8124,7 -6457,6 +8062,7 @@@ msgstr "|N|Pocz�tkowy nowy PIN
msgid "run in multi server mode (foreground)"
msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
@@@ -8182,19 -6503,16 +8120,19 @@@ msgstr "
"Sk�adnia: scdaemon [opcje] [polecenie [argumenty]]\n"
"Demon kart procesorowych dla GnuPG\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
#, 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:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr "obs�uga fd %d uruchomiona\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "obs�uga fd %d zako�czona\n"
@@@ -8299,12 -6594,10 +8237,12 @@@ msgstr "prosz� upewni� si�, �e ,,dirmng
msgid "checking the CRL failed: %s"
msgstr "sprawdzenie CRL nie powiod�o si�: %s"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr "certyfikat o niewa�nej wa�no�ci: %s"
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr "certyfikat jeszcze nie jest wa�ny"
@@@ -8316,7 -6607,6 +8254,7 @@@ msgstr "certyfikat g��wny jeszcze nie j
msgid "intermediate certificate not yet valid"
msgstr "certyfikat po�redni jeszcze nie jest wa�ny"
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
msgid "certificate has expired"
msgstr "certyfikat wygas�"
@@@ -8365,7 -6644,6 +8303,7 @@@ msgstr " (certyfikat wa�ny od
msgid " ( issuer valid from "
msgstr " ( wystawca wa�ny od "
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, c-format
msgid "fingerprint=%s\n"
msgstr "odcisk=%s\n"
@@@ -8394,7 -6666,6 +8332,7 @@@ msgstr "nie znaleziono wystawcy w certy
msgid "self-signed certificate has a BAD signature"
msgstr "w�asnor�cznie podpisany certyfikat ma Z�Y podpis"
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr "g��wny certyfikat nie jest oznaczony jako zaufany"
@@@ -8403,28 -6673,22 +8341,28 @@@
msgid "checking the trust list failed: %s\n"
msgstr "sprawdzenie listy zaufania nie powiod�o si�: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr "�a�cuch certyfikat�w zbyt d�ugi\n"
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr "nie znaleziono wystawcy certyfikatu"
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
msgid "certificate has a BAD signature"
msgstr "certyfikat ma Z�Y podpis"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr "znaleziono inny by� mo�e pasuj�cy certyfikat CA - ponawianie pr�by"
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr "�a�cuch certyfikat�w d�u�szy ni� zezwala CA (%d)"
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
msgid "certificate is good\n"
msgstr "certyfikat jest dobry\n"
@@@ -8454,7 -6712,6 +8392,7 @@@ msgstr "skr�t %u-bitowy nie jest popraw
msgid "(this is the MD2 algorithm)\n"
msgstr "(to jest algorytm MD2)\n"
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
msgid "none"
msgstr "brak"
@@@ -8488,37 -6740,29 +8426,37 @@@ msgstr "
"S/N %s, ID 0x%08lX,\n"
"stworzony %s, wygasa %s.\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr ""
"nie okre�lono sposobu wykorzystania klucza - przyj�to wszystkie sposoby\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "b��d podczas pobierania informacji o wykorzystaniu klucza: %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr "certyfikat nie powinien by� u�ywany do po�wiadczania\n"
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr "certyfikat nie powinien by� u�ywany do podpisywania odpowiedzi OCSP\n"
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr "certyfikat nie powinien by� u�ywany do szyfrowania\n"
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr "certyfikat nie powinien by� u�ywany do podpisywania\n"
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr "certyfikat nie nadaje si� do szyfrowania\n"
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr "certyfikat nie nadaje si� do podpisywania\n"
@@@ -8971,23 -7125,19 +8909,23 @@@ msgstr "%s:%u: podano has�o bez u�ytkow
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: linia pomini�ta\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
msgid "could not parse keyserver\n"
msgstr "niezrozumia�y adres serwera kluczy\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, 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:1673
++#: sm/gpgsm.c:1670
#, 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:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr "b��dne polecenie (nie ma polecenia domy�lnego)\n"
@@@ -9049,7 -7187,6 +8987,7 @@@ msgstr "problem z ponownym odszukaniem
msgid "error storing flags: %s\n"
msgstr "b��d zapisywania flag: %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr "B��d - "
@@@ -9180,112 -7296,87 +9118,106 @@@ msgstr "problem odszukaniem istniej�ceg
msgid "dropping %u certificates from the cache\n"
msgstr "poszukiwanie wystawcy w pami�ci podr�cznej Dirmngr\n"
- #: dirmngr/certcache.c:352
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
- msgid "can't access directory '%s': %s\n"
- msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't parse certificate '%s': %s\n"
msgstr "nie mo�na utworzy� ,,%s'': %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, fuzzy, c-format
#| msgid "certificate `%s' deleted\n"
msgid "certificate '%s' already cached\n"
msgstr "certyfikat ,,%s'' usuni�ty\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, fuzzy, c-format
#| msgid "duplicated certificate `%s' deleted\n"
msgid "trusted certificate '%s' loaded\n"
msgstr "powt�rzony certyfikat ,,%s'' usuni�ty\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, fuzzy, c-format
#| msgid "certificate `%s' deleted\n"
msgid "certificate '%s' loaded\n"
msgstr "certyfikat ,,%s'' usuni�ty\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, fuzzy, c-format
#| msgid "fingerprint=%s\n"
msgid " SHA1 fingerprint = %s\n"
msgstr "odcisk=%s\n"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error loading certificate '%s': %s\n"
msgstr "b��d zapisywania certyfikatu: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, fuzzy, c-format
#| msgid "Included certificates"
msgid "permanently loaded certificates: %u\n"
msgstr "Do��czone certyfikaty"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, fuzzy, c-format
#| msgid "number of matching certificates: %d\n"
msgid " runtime cached certificates: %u\n"
msgstr "liczba pasuj�cych certyfikat�w: %d\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
#, fuzzy
#| msgid " (certificate created at "
msgid "certificate already cached\n"
msgstr " (certyfikat utworzony "
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate cached\n"
msgstr "certyfikat jest dobry\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error caching certificate: %s\n"
msgstr "b��d zapisywania certyfikatu: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "niew�a�ciwy odcisk"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error fetching certificate by S/N: %s\n"
msgstr "b��d zapisywania certyfikatu: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error fetching certificate by subject: %s\n"
msgstr "b��d zapisywania certyfikatu: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
#, fuzzy
#| msgid "no issuer found in certificate"
msgid "no issuer found in certificate\n"
msgstr "nie znaleziono wystawcy w certyfikacie"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error getting authorityKeyIdentifier: %s\n"
@@@ -9572,7 -7612,6 +9504,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "b��d pobierania zapisanych flag: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
@@@ -9593,7 -7629,6 +9525,7 @@@ msgstr "
msgid "converting S-expression failed: %s\n"
msgstr "iconv_open nie powiod�o si�: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, fuzzy, c-format
#| msgid "receiving line failed: %s\n"
msgid "creating S-expression failed: %s\n"
@@@ -10028,129 -7983,96 +9960,123 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:159
- #, fuzzy
- #| msgid "run in daemon mode (background)"
- msgid "run as windows service (background)"
- msgstr "uruchomienie w trybie demona (w tle)"
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
#, 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:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "przekazanie polecenia do dirmngr"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr "|PLIK|zapisanie log�w trybu serwerowego do PLIKu"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "Wyj�� bez zapisania zmian? (t/N) "
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "zezwolenie na wyszukiwania PKA (��dania DNS)"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
#, fuzzy
#| msgid "|FILE|read options from FILE"
msgid "|FILE|read LDAP server list from FILE"
msgstr "|PLIK|odczyt opcji z PLIKU"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 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:209
++#: dirmngr/dirmngr.c:196
#, fuzzy
#| msgid "|URL|use keyserver at URL"
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|u�ywaj serwera kluczy URL"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10163,13 -8085,11 +10089,13 @@@ msgstr "
"@\n"
"(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Wywo�anie: gpgconf [opcje] (-h podaje pomoc)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10181,88 -8101,71 +10107,88 @@@ msgstr "
"Sk�adnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
"Zarz�dzanie kluczem tajnym dla GnuPG\n"
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, fuzzy, c-format
#| msgid "invalid debug-level `%s' given\n"
msgid "valid debug levels are: %s\n"
msgstr "podano b��dny poziom diagnostyki ,,%s''\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "wywo�anie: gpgsm [opcje]"
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
#, 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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, 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:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, 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:1594
++#: dirmngr/dirmngr.c:1418
#, 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:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "niew�a�ciwy odcisk"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, 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:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "nie wymuszono"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10635,115 -8468,94 +10561,115 @@@ msgstr "sprawdzenie listy zaufania nie
msgid "not signed by a default OCSP signer's certificate"
msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, fuzzy, c-format
#| msgid "receiving line failed: %s\n"
msgid "allocating list item failed: %s\n"
msgstr "odbieranie linii nie powiod�o si�: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error getting responder ID: %s\n"
msgstr "b��d podczas odczytu nowego PIN-u: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
#, fuzzy
#| msgid "certificate should not have been used for OCSP response signing\n"
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr "certyfikat nie powinien by� u�ywany do podpisywania odpowiedzi OCSP\n"
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, fuzzy, c-format
#| msgid "issuer certificate not found"
msgid "issuer certificate not found: %s\n"
msgstr "nie znaleziono wystawcy certyfikatu"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
#, fuzzy
#| msgid "error reading list of trusted root certificates\n"
msgid "caller did not return the target certificate\n"
msgstr "b��d odczytu listy zaufanych certyfikat�w g��wnych\n"
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
#, fuzzy
#| msgid "error storing certificate\n"
msgid "caller did not return the issuing certificate\n"
msgstr "b��d zapisywania certyfikatu\n"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, fuzzy, c-format
#| msgid "failed to allocate keyDB handle\n"
msgid "failed to allocate OCSP context: %s\n"
msgstr "nie uda�o si� przydzieli� uchwytu keyDB\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't get authorityInfoAccess: %s\n"
msgstr "nie mo�na dosta� si� do ,,%s'': %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
#, fuzzy
#| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
msgstr "brak domy�lnego zbioru kluczy tajnych: %s\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, fuzzy, c-format
#| msgid "using default PIN as %s\n"
msgid "using default OCSP responder '%s'\n"
msgstr "u�ycie domy�lnego PIN-u jako %s\n"
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, fuzzy, c-format
#| msgid "using cipher %s\n"
msgid "using OCSP responder '%s'\n"
msgstr "szyfrem %s\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "b��d zapisywania certyfikatu: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, fuzzy, c-format
#| msgid "certificate has been revoked"
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "certyfikat zosta� uniewa�niony"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr ""
@@@ -10797,36 -8599,30 +10723,36 @@@ msgstr "select nie powiod�o si�: %s\n
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, 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:2415
++#: dirmngr/server.c:2377
#, 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:2436
++#: dirmngr/server.c:2398
#, 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:2444
++#: dirmngr/server.c:2406
#, 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:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10854,39 -8646,29 +10780,35 @@@ msgstr "
msgid "checking CRL for"
msgstr "sprawdzenie CRL nie powiod�o si�: %s"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
#, fuzzy
#| msgid "self-signed certificate has a BAD signature"
msgid "selfsigned certificate has a BAD signature"
msgstr "w�asnor�cznie podpisany certyfikat ma Z�Y podpis"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, fuzzy, c-format
#| msgid "checking for qualified certificate failed: %s\n"
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "sprawdzenie certyfikatu kwalifikowanego nie powiod�o si�: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate chain is good\n"
msgstr "certyfikat jest dobry\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr ""
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
#, fuzzy
#| msgid "certificate should not have been used for signing\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:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
msgid "quiet"
msgstr "cicho"
@@@ -11024,11 -8775,9 +10946,11 @@@ msgstr "|N|ustawienie maksymalnego czas
msgid "Options enforcing a passphrase policy"
msgstr "Opcje wymuszaj�ce polityk� hase�"
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr "nie zezwalanie na pomini�cie polityki hase�"
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|ustawienie minimalnej d�ugo�ci nowych hase� na N"
@@@ -11172,77 -8889,61 +11094,77 @@@ msgstr "Zewn�trzna weryfikacja komponen
msgid "Note that group specifications are ignored\n"
msgstr "Uwaga, okre�lenia grup s� ignorowane\n"
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr "lista wszystkich komponent�w"
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr "sprawdzenie wszystkich program�w"
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr "|KOMPONENT|wypisanie opcji"
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr "|KOMPONENT|zmiana opcji"
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr "|KOMPONENT|zaznaczenie opcji"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr "zastosowanie globalnych warto�ci domy�lnych"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
#, fuzzy
#| msgid "get the configuration directories for gpgconf"
msgid "get the configuration directories for @GPGCONF@"
msgstr "katalogi konfiguracyjne programu gpgconf"
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
msgid "list global configuration file"
msgstr "wy�wietl globalny plik konfiguracyjny"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
msgid "check global configuration file"
msgstr "sprawdzenie globalnego pliku konfiguracyjnego"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
#, fuzzy
#| msgid "list all components"
msgid "reload all or a given component"
msgstr "lista wszystkich komponent�w"
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
#, fuzzy
#| msgid "list all components"
msgid "launch a given component"
msgstr "lista wszystkich komponent�w"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
#, fuzzy
#| msgid "list all components"
msgid "kill a given component"
msgstr "lista wszystkich komponent�w"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "plik wyj�ciowy"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr "uaktywnienie zmian w czasie dzia�ania o ile to mo�liwe"
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
#, 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:119
++#: tools/gpgconf.c:121
#, fuzzy
#| msgid ""
#| "Syntax: gpgconf [options]\n"
@@@ -11254,15 -8955,12 +11176,15 @@@ msgstr "
"Sk�adnia: gpgconf [opcje]\n"
"Zarz�dzanie opcjami konfiguracji dla narz�dzi z systemu GnuPG\n"
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr "Wymagany jest jeden argument komponentu"
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
msgid "Component not found"
msgstr "Nie znaleziono komponentu"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
msgid "No argument allowed"
msgstr "Argument nie jest dozwolony"
@@@ -11314,123 -9003,98 +11236,123 @@@ msgstr "
"[opcje...] POLECENIE [plik-we�ciowy]\n"
"Wywo�anie prostego narz�dzia do szyfrowania symetrycznego\n"
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s na %s przerwany ze stanem %i\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, c-format
msgid "%s on %s failed with status %i\n"
msgstr "%s na %s nie powi�d� si� ze stanem %i\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, fuzzy, c-format
#| msgid "can't create temporary directory `%s': %s\n"
msgid "can't create temporary directory '%s': %s\n"
msgstr "nie mo�na utworzy� katalogu tymczasowego,,%s'': %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr "nie uda�o si� otworzy� %s do zapisu: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, c-format
msgid "error writing to %s: %s\n"
msgstr "b��d zapisu do %s: %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, c-format
msgid "error reading from %s: %s\n"
msgstr "b��d odczytu z %s: %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, c-format
msgid "error closing %s: %s\n"
msgstr "b��d zamykania %s: %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
msgid "no --program option provided\n"
msgstr "nie podano opcji --program\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr "obs�ugiwane s� tylko --decrypt i --encrypt\n"
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr "nie podano opcji --keyfile\n"
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr "nie mo�na przydzieli� wektora args\n"
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, c-format
msgid "could not create pipe: %s\n"
msgstr "nie uda�o si� utworzy� potoku: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, c-format
msgid "could not create pty: %s\n"
msgstr "nie uda�o si� utworzy� pty: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr "nie uda�o si� wykona� fork: %s\n"
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, c-format
msgid "execv failed: %s\n"
msgstr "execv nie powiod�o si�: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, c-format
msgid "select failed: %s\n"
msgstr "select nie powiod�o si�: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, c-format
msgid "read failed: %s\n"
msgstr "odczyt nie powi�d� si�: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, c-format
msgid "pty read failed: %s\n"
msgstr "odczyt pty nie powi�d� si�: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, c-format
msgid "waitpid failed: %s\n"
msgstr "waitpid nie powiod�o si�: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr "potomek zosta� przerwany ze stanem %i\n"
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "nie mo�na przydzieli� �a�cucha pliku wej�ciowego: %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "nie mo�na przydzieli� �a�cucha pliku wyj�ciowego: %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr "musi by� podane %s lub %s\n"
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr "nie podano klasy\n"
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, c-format
msgid "class %s is not supported\n"
msgstr "klasa %s nie jest obs�ugiwana\n"
diff --cc po/pt.po
index 783e787,93d2941..fc932d0
--- a/po/pt.po
+++ b/po/pt.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2015-02-11 19:17+0100\n"
"Last-Translator: Pedro Morais <morais at kde.org>\n"
"Language-Team: pt <morais at kde.org>\n"
@@@ -101,14 -85,10 +101,14 @@@ msgstr "Por favor digite a frase secret
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
#, fuzzy
msgid "Passphrase:"
msgstr "frase secreta incorrecta"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr ""
@@@ -153,98 -125,70 +153,98 @@@ msgstr "MPI incorreto
msgid "Bad Passphrase"
msgstr "frase secreta incorrecta"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, 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:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, fuzzy, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "nenhum porta-chaves secreto com permiss�es de escrita encontrado: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, fuzzy, c-format
msgid "shadowing the key failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, fuzzy, c-format
msgid "error writing key: %s\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Por favor digite a frase secreta \n"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "muda a frase secreta"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
"%s%%0Awithin gpg-agent's key storage"
msgstr "Por favor digite a frase secreta \n"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
@@@ -385,8 -303,6 +385,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "muda a frase secreta"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -396,68 -312,48 +396,68 @@@ msgstr "
"Op��es:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detalhado"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "procurar chaves num servidor de chaves"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualizar a base de dados de confian�a"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
@@@ -465,51 -361,40 +465,51 @@@ msgstr "
"|NOME|definir mapa de caracteres do terminal como\n"
"NOME"
- #: agent/gpg-agent.c:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
#, fuzzy
msgid "allow presetting passphrase"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "n�o suportado"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -518,133 -403,91 +518,125 @@@ 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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Por favor comunique bugs para <gnupg-bugs at gnu.org>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr ""
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "ficheiro de op��es `%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, 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:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "imposs�vel criar %s: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
#, 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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, 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:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "a escrever chave privada para `%s'\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, fuzzy, c-format
msgid "can't create directory '%s': %s\n"
msgstr "%s: imposs�vel criar directoria: %s\n"
- #: agent/gpg-agent.c:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: directoria criada\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, 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:1958
++#: agent/gpg-agent.c:1957
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: imposs�vel criar directoria: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@@ -659,28 -500,22 +651,28 @@@ msgstr "
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2390
++#: agent/gpg-agent.c:2392
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "actualiza��o da chave secreta falhou: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ignorado: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
@@@ -696,8 -529,6 +688,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -705,9 -536,6 +697,9 @@@ msgstr "
"@Comandos:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -728,40 -554,33 +720,40 @@@ msgid "
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Por favor digite a frase secreta \n"
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Por favor digite a frase secreta \n"
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "Por favor digite a frase secreta \n"
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
#, fuzzy
msgid "cancelled\n"
msgstr "cancelado pelo utilizador\n"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, fuzzy, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@@ -931,42 -721,30 +923,42 @@@ msgstr "algoritmo de protec��o %d%s n�
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "erro na leitura de `%s': %s\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "erro na leitura de `%s': %s\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "erro na leitura de `%s': %s\n"
@@@ -981,37 -757,15 +973,18 @@@ msgstr "erro ao escrever no porta-chave
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "imposs�vel ligar a `%s': %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "problemas na comunica��o com o gpg-agent\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
#, fuzzy
msgid "problem setting the gpg-agent options\n"
msgstr "problema com o agente: o agente returnou 0x%lx\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- #, fuzzy
- msgid "canceled by user\n"
- msgstr "cancelado pelo utilizador\n"
-
- #: common/simple-pwquery.c:579
- #, fuzzy
- msgid "problem with the agent\n"
- msgstr "problema com o agente: o agente returnou 0x%lx\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "problema com o agente: o agente returnou 0x%lx\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "imposs�vel desactivar core dumps: %s\n"
@@@ -1098,7 -835,6 +1071,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1122,17 -854,14 +1095,17 @@@ msgstr "
msgid "connection to agent is in restricted mode\n"
msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr ""
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1426,7 -1095,6 +1399,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
#, fuzzy
msgid "out of core\n"
msgstr "n�o processado"
@@@ -1485,7 -1142,10 +1458,13 @@@ msgstr "chave p�blica %08lX n�o encontr
msgid "waiting for lock %s...\n"
msgstr "a escrever chave privada para `%s'\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr ""
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "armadura: %s\n"
@@@ -1736,10 -1341,6 +1715,10 @@@ msgstr "a escrever chave p�blica para `
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
@@@ -2038,27 -1574,18 +2017,27 @@@ msgstr "a escrever chave privada para `
msgid "Invalid command (try \"help\")\n"
msgstr "Comando inv�lido (tente \"help\")\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output n�o funciona para este comando\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "imposs�vel abrir `%s'\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, 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:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "erro na leitura do bloco de chave: %s\n"
@@@ -2120,46 -1635,38 +2099,46 @@@ msgstr "h� uma chave secreta para a cha
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "utilize a op��o \"--delete-secret-keys\" para a apagar primeiro.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "n�o � poss�vel utilizar o pacote ESK sim�trico devido ao modo S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, fuzzy, c-format
msgid "using cipher %s\n"
msgstr "assinatura falhou: %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "%s' j� comprimido\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "AVISO: `%s' � um ficheiro vazio\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "lendo de `%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2168,18 -1675,15 +2147,18 @@@ msgstr "
"ao for�ar o algoritmo de compress�o %s (%d) viola as prefer�ncias do "
"destinat�rio\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
@@@ -2287,8 -1770,6 +2266,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: ignorado: %s\n"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2325,8 -1799,6 +2304,8 @@@ msgstr "erro ao criar `%s': %s\n
msgid "[User ID not found]"
msgstr "[Utilizador n�o encontrado]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "op��es de importa��o inv�lidas\n"
@@@ -2395,222 -1854,173 +2374,222 @@@ msgstr "Chave inv�lida %08lX tornada v�
msgid "using subkey %s instead of primary key %s\n"
msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "fazer uma assinatura separada"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
#, fuzzy
msgid "make a clear text signature"
msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "fazer uma assinatura separada"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "cifrar dados"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "cifrar apenas com cifra sim�trica"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "decifrar dados (ac��o por omiss�o)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verificar uma assinatura"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "listar as chaves"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "listar as chaves e as assinaturas"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "list and check key signatures"
msgstr "verificar as assinaturas das chaves"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "listar as chaves e as impress�es digitais"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "listar as chaves secretas"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "gerar um novo par de chaves"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "gerar um novo par de chaves"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "gerar um novo par de chaves"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "gerar um novo par de chaves"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "gerar um certificado de revoga��o"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "remover chaves do porta-chaves p�blico"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "remover chaves do porta-chaves secreto"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "assinar uma chave"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "assinar uma chave localmente"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "assinar uma chave"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "assinar uma chave localmente"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "assinar ou editar uma chave"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "muda a frase secreta"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "exportar chaves"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "exportar chaves para um servidor de chaves"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "importar chaves de um servidor de chaves"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "procurar chaves num servidor de chaves"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "actualizar todas as chaves a partir de um servidor de chaves"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "importar/fundir chaves"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "actualizar a base de dados de confian�a"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
#, fuzzy
msgid "print message digests"
msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "criar sa�da com armadura ascii"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifrar para NOME"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"usar este identificador de utilizador para\n"
"assinar ou decifrar"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr ""
"|N|estabelecer n�vel de compress�o N\n"
"(0 desactiva)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "n�o fazer altera��es"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "perguntar antes de sobrep�r"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2618,7 -2028,6 +2597,7 @@@ msgstr "
"@\n"
"(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2638,13 -2047,11 +2617,13 @@@ msgstr "
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impress�es digitais\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2659,7 -2066,6 +2638,7 @@@ msgstr "
"assina, verifica, cifra ou decifra\n"
"a opera��o por omiss�o depende dos dados de entrada\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2667,606 -2073,472 +2646,601 @@@ msgstr "
"\n"
"Algoritmos suportados:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "Chave p�blica: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Cifra: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Dispers�o: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Compress�o: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uso: gpg [op��es] "
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "comandos em conflito\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "criado um novo ficheiro de configura��o `%s'\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostrar em que porta-chave a chave est�"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "desactiva uma chave"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, fuzzy, c-format
#| msgid "NOTE: old default options file `%s' ignored\n"
msgid "Note: old default options file '%s' ignored\n"
msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr ""
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "NOTA: %s n�o � para uso normal!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "Endere�o eletr�nico inv�lido\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritmo de dispers�o inv�lido `%s'\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "n�o consegui processar a URI do servidor de chaves\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
#, fuzzy
msgid "invalid list options\n"
msgstr "op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
#, fuzzy
msgid "invalid verify options\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um ficheiro core!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sobrep�e %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n�o � permitido com %s!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n�o faz sentido com %s!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "a escrever chave privada para `%s'\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth deve estar na entre 1 e 255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "prefer�ncias por omiss�o inv�lidas\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s n�o faz sentido com %s!\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, fuzzy, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, fuzzy, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, fuzzy, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"AVISO: destinat�rios (-r) dados sem utilizar uma cifra de chave p�blica\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [nome_do_ficheiro]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [nome_do_ficheiro]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "decifragem falhou: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [nome_do_ficheiro]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nome_do_ficheiro]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [nome_do_ficheiro]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_ficheiro]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key id-utilizador"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key id-utilizador"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-utilizador [comandos]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id-utilizador"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
msgid "export as ssh key failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualiza��o da chave secreta falhou: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "algoritmo de dispers�o inv�lido `%s'\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[nome_do_ficheiro]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Digite a sua mensagem ...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@@ -3312,328 -2576,262 +3286,328 @@@ msgstr "Nenhuma ajuda dispon�vel
msgid "No help available for '%s'"
msgstr "Nenhuma ajuda dispon�vel para `%s'"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "actualizar a base de dados de confian�a"
- #: g10/import.c:143
++#: g10/import.c:147
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "actualizar a base de dados de confian�a"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
msgid "show key during import"
msgstr "mostra impress�o digital"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:152
++#: g10/import.c:156
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "chave secreta n�o utiliz�vel"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "ignorando bloco do tipo %d\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu chaves processadas at� agora\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "N�mero total processado: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " ignorei novas chaves: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ignorei novas chaves: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sem IDs de utilizadores: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importados: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " n�o modificados: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novos IDs de utilizadores: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novas subchaves: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " novas assinaturas: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novas revoga��es de chaves: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chaves secretas lidas: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " chaves secretas importadas: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " chaves secretas n�o modificadas: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " n�o importadas: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " novas assinaturas: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " chaves secretas lidas: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1042
++#: g10/import.c:1048
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "assinatura %s de: \"%s\"\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chave %08lX: sem ID de utilizador\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "ignorado `%s': %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1264
++#: g10/import.c:1343
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "isto pode ser causado por falta de auto-assinatura\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "chave %08lX: chave nova - ignorada\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chave %08lX: \"%s\" n�o modificada\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chave %08lX: chave secreta importada\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "ignorado: a chave secreta j� est� presente\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "chave `%s' n�o encontrada: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "a escrever chave privada para `%s'\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "chave %08lX: chave secreta com cifra inv�lida %d - ignorada\n"
@@@ -3648,144 -2846,117 +3622,144 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
"de revoga��o\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"chave %08lX: algoritmo de chave p�blica n�o suportado no utilizador \"%s\"\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "chave %08lX: auto-assinatura inv�lida do utilizador \"%s\"\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "chave %08lX: assinatura directa de chave adicionada\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chave %08lX: liga��o de subchave inv�lida\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "chave %08lX: apagada liga��o m�ltipla de subchave \n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "chave %08lX: sem subchave para revoca��o de chave\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "chave %08lX: removida revoga��o m�ltiplace de subchaves\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chave %08lX: ignorado ID de utilizador '"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chave %08lX: subchave ignorada\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorado\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVISO: a chave %08lX pode estar revocada: a transferir a chave de revoca��o "
"%08lX\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
"presente.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: assinatura directa de chave adicionada\n"
@@@ -4145,8 -3254,6 +4119,8 @@@ msgstr "
msgid "Really sign? (y/N) "
msgstr "Realmente assinar? "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "assinatura falhou: %s\n"
@@@ -4634,14 -3639,10 +4608,14 @@@ msgstr "
"N�o se esque�a que a validade de chave mostrada n�o � necess�riamente a\n"
"correcta a n�o ser que reinicie o programa.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
#, fuzzy
msgid "revoked"
msgstr "revkey"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5601,26 -4424,22 +5575,26 @@@ msgstr " Impress�o da chave =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "a verificar o porta chaves `%s'\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "%lu chave verificadas (%lu assinaturas)\n"
msgstr[1] "%lu chave verificadas (%lu assinaturas)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5628,7 -4447,6 +5602,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 assinatura incorrecta\n"
msgstr[1] "1 assinatura incorrecta\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: porta-chaves criado\n"
@@@ -5849,120 -4622,100 +5823,125 @@@ msgstr "revoca��o solit�ria - utilize \
msgid "no signature found\n"
msgstr "Assinatura correcta de \""
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Assinatura INCORRECTA de \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Assinatura expirada de \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Assinatura correcta de \""
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "verifica��o de assinatura suprimida\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " ou \""
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ msgid " issuer \"%s\"\n"
+ msgstr " ou \""
+
++#: g10/mainproc.c:1772
#, fuzzy
msgid "Key available at: "
msgstr "Nenhuma ajuda dispon�vel"
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[incerto]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " ou \""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, fuzzy, c-format
msgid "Signature expired %s\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, fuzzy, c-format
msgid "Signature expires %s\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, fuzzy, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "assinatura %s de: \"%s\"\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
#, fuzzy
msgid "binary"
msgstr "primary"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr ""
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
#, fuzzy
msgid "unknown"
msgstr "vers�o desconhecida"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritmo de chave p�blica desconhecido"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Imposs�vel verificar assinatura: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "n�o � uma assinatura separada\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"AVISO: v�rias assinaturas detectadas. Apenas a primeira ser� verificada.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "assinatura de classe 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "formato de assinatura antigo (PGP2.x)\n"
@@@ -6146,90 -4864,44 +6125,55 @@@ msgstr "
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "problema com o agente: o agente returnou 0x%lx\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, fuzzy, c-format
- msgid " (main key ID %s)"
- msgstr " (ID principal da chave %08lX)"
-
- #: g10/passphrase.c:277
- #, fuzzy, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Precisa de uma frase secreta para desbloquear a chave secreta do "
- "utilizador:\n"
- "\n"
- "\"%.*s\"\n"
- "chave %u bits %s, ID %08lx, criada %s%s\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Insira a frase secreta\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "cancelado pelo utilizador\n"
- #: g10/passphrase.c:483
- #, fuzzy, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "\n"
- "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
- "utilizador: \""
-
- #: g10/passphrase.c:491
++#: g10/passphrase.c:489
#, fuzzy, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr ""
+ msgid " (main key ID %s)"
+ msgstr " (ID principal da chave %08lX)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Por favor digite a frase secreta \n"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Por favor digite a frase secreta \n"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Por favor digite a frase secreta \n"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Por favor digite a frase secreta \n"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Voc� quer realmente remover as chaves selecionadas? "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Voc� quer realmente remover as chaves selecionadas? "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6430,129 -5067,102 +6374,129 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "Usar esta chave de qualquer modo? "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "AVISO: A utilizar uma chave que n�o � de confian�a!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
#, fuzzy
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr ""
"AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
"presente.\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
#, fuzzy
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Isto pode significar que a assinatura � falsificada.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Nota: Esta chave foi desactivada.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Nota: Esta chave expirou!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " N�o h� indica��o de que a assinatura pertence ao dono.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " A assinatura � provavelmente uma FALSIFICA��O.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
" confi�veis!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
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:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ignorado: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ignorado: a chave p�blica est� desactivada\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, 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:991
++#: g10/pkclist.c:995
#, 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:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6560,37 -5170,29 +6504,37 @@@ msgstr "
"\n"
"Insira o identificador do utilizador. Termine com uma linha vazia: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Identificador de utilizador inexistente.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
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:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "A chave p�blica est� desativada.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "ignorado: a chave p�blica j� est� presente\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "nenhum endere�o v�lido\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "chave %08lX: sem ID de utilizador\n"
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "chave %08lX: sem ID de utilizador\n"
@@@ -6866,7 -5416,6 +6810,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "a chave p�blica %08lX � %lu segundo mais nova que a assinatura\n"
msgstr[1] "a chave p�blica %08lX � %lu segundo mais nova que a assinatura\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6942,12 -5482,10 +6886,12 @@@ msgstr "
"AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
"A utilizar n�o expandida.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "assinatura %s de: \"%s\"\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6955,11 -5493,9 +6899,11 @@@ msgstr "
"for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
"destinat�rio\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "a assinar:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "ser� utilizada a cifragem %s\n"
@@@ -7065,7 -5581,6 +7009,7 @@@ msgstr "transa��o de base de dados de c
msgid "%s: directory does not exist!\n"
msgstr "%s: diretoria inexistente!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "imposs�vel fechar `%s': %s\n"
@@@ -7177,150 -5670,117 +7121,142 @@@ msgstr "imposs�vel manipular linhas de
msgid "input line longer than %d characters\n"
msgstr "linha de entrada maior que %d caracteres\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Algoritmos suportados:\n"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Pol�tica: "
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "listar as chaves"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7330,93 -5790,78 +7266,93 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
msgid "Verified %ld messages signed by \"%s\"."
msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7427,20 -5872,16 +7363,20 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7457,8 -5898,6 +7393,7 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
@@@ -7999,7 -6329,6 +7934,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8055,16 -6373,13 +7990,16 @@@ msgid "
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8169,12 -6461,10 +8104,12 @@@ msgstr "
msgid "checking the CRL failed: %s"
msgstr "verifica��o da assinatura criada falhou: %s\n"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr ""
@@@ -8187,7 -6475,6 +8122,7 @@@ msgstr "a escrever chave privada para `
msgid "intermediate certificate not yet valid"
msgstr ""
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
#, fuzzy
msgid "certificate has expired"
msgstr "Esta chave expirou!"
@@@ -8243,7 -6519,6 +8178,7 @@@ msgstr "certificado incorrecto
msgid " ( issuer valid from "
msgstr ""
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "mostra impress�o digital"
@@@ -8273,7 -6542,6 +8208,7 @@@ msgstr "gerar um certificado de revoga�
msgid "self-signed certificate has a BAD signature"
msgstr ""
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr ""
@@@ -8282,29 -6549,23 +8217,29 @@@
msgid "checking the trust list failed: %s\n"
msgstr "verifica��o da assinatura criada falhou: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr ""
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr ""
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "verificar uma assinatura"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr ""
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
#, fuzzy
msgid "certificate is good\n"
msgstr "prefer�ncia %c%lu duplicada\n"
@@@ -8337,7 -6592,6 +8272,7 @@@ msgstr "
msgid "(this is the MD2 algorithm)\n"
msgstr ""
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
#, fuzzy
msgid "none"
msgstr "n�o"
@@@ -8375,36 -6624,28 +8310,36 @@@ msgstr "
"\"%.*s\"\n"
"chave %u bits %s, ID %08lx, criada %s%s\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr ""
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr ""
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr ""
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr ""
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr ""
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr ""
@@@ -8846,22 -6997,18 +8781,22 @@@ msgstr "
msgid "%s:%u: skipping this line\n"
msgstr " s = saltar esta chave\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "n�o consegui processar a URI do servidor de chaves\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "a escrever para `%s'\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "imposs�vel fechar `%s': %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8924,7 -7059,6 +8859,7 @@@ msgstr "rev? problema ao verificar revo
msgid "error storing flags: %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr ""
@@@ -9043,97 -7156,73 +8978,92 @@@ msgstr "
msgid "dropping %u certificates from the cache\n"
msgstr ""
- #: dirmngr/certcache.c:352
- #, fuzzy, c-format
- msgid "can't access directory '%s': %s\n"
- msgstr "%s: imposs�vel criar directoria: %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't parse certificate '%s': %s\n"
msgstr "imposs�vel criar `%s': %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, fuzzy, c-format
msgid "certificate '%s' already cached\n"
msgstr "prefer�ncia %c%lu duplicada\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, fuzzy, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, fuzzy, c-format
msgid "certificate '%s' loaded\n"
msgstr "prefer�ncia %c%lu duplicada\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, fuzzy, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr "mostra impress�o digital"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, fuzzy, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, fuzzy, c-format
msgid "permanently loaded certificates: %u\n"
msgstr "certificado incorrecto"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, fuzzy, c-format
msgid " runtime cached certificates: %u\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
#, fuzzy
msgid "certificate already cached\n"
msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
#, fuzzy
msgid "certificate cached\n"
msgstr "prefer�ncia %c%lu duplicada\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, fuzzy, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "%s: vers�o de ficheiro inv�lida %d\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, fuzzy, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, fuzzy, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
#, fuzzy
msgid "no issuer found in certificate\n"
msgstr "gerar um certificado de revoga��o"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, fuzzy, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
@@@ -9394,7 -7432,6 +9324,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
@@@ -9414,7 -7448,6 +9344,7 @@@ msgstr "
msgid "converting S-expression failed: %s\n"
msgstr "imposs�vel abrir %s: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
@@@ -9810,116 -7763,85 +9740,112 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr ""
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
#, fuzzy
msgid "run without asking a user"
msgstr "Sair sem gravar? "
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "n�o consegui processar a URI do servidor de chaves\n"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9932,91 -7854,72 +9858,91 @@@ msgstr "
"@\n"
"(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uso: gpg [op��es] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
#, 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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "frase secreta demasiado longa\n"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s: vers�o de ficheiro inv�lida %d\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "armadura: %s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
#, fuzzy
msgid "shutdown forced\n"
msgstr "n�o processado"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10362,102 -8195,81 +10288,102 @@@ msgstr "verifica��o da assinatura criad
msgid "not signed by a default OCSP signer's certificate"
msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, fuzzy, c-format
msgid "allocating list item failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, fuzzy, c-format
msgid "error getting responder ID: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr ""
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, fuzzy, c-format
msgid "issuer certificate not found: %s\n"
msgstr "chave `%s' n�o encontrada: %s\n"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr ""
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
#, fuzzy
msgid "caller did not return the issuing certificate\n"
msgstr "gerar um certificado de revoga��o"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, fuzzy, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, fuzzy, c-format
#| msgid "%s: can't access: %s\n"
msgid "can't get authorityInfoAccess: %s\n"
msgstr "%s: imposs�vel aceder: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
#, fuzzy
#| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr ""
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, fuzzy, c-format
msgid "using OCSP responder '%s'\n"
msgstr "assinatura falhou: %s\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, fuzzy, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, fuzzy, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "NOTA: a chave foi revogada"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr ""
@@@ -10505,33 -8307,27 +10431,33 @@@ msgstr "remo��o do bloco de chave falho
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "imposs�vel criar `%s': %s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, 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:2436
++#: dirmngr/server.c:2398
#, 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:2444
++#: dirmngr/server.c:2406
#, 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:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10556,34 -8348,24 +10482,30 @@@ msgstr "
msgid "checking CRL for"
msgstr "verifica��o da assinatura criada falhou: %s\n"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
#, fuzzy
msgid "selfsigned certificate has a BAD signature"
msgstr "verificar uma assinatura"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, fuzzy, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "verifica��o da assinatura criada falhou: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
#, fuzzy
msgid "certificate chain is good\n"
msgstr "prefer�ncia %c%lu duplicada\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA necessita de utiliza��o de uma algoritmo de dispers�o de 160 bit\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "sair"
@@@ -10711,11 -8462,9 +10633,11 @@@ msgstr "
msgid "Options enforcing a passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
@@@ -10857,85 -8574,66 +10779,85 @@@ msgstr "
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
#, fuzzy
msgid "list global configuration file"
msgstr "criado um novo ficheiro de configura��o `%s'\n"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
#, fuzzy
msgid "check global configuration file"
msgstr "criado um novo ficheiro de configura��o `%s'\n"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "usar como ficheiro de sa�da"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
#, fuzzy
msgid "Component not found"
msgstr "chave p�blica n�o encontrada"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
#, fuzzy
msgid "No argument allowed"
msgstr "a escrever chave privada para `%s'\n"
@@@ -10989,122 -8678,97 +10911,122 @@@ msgid "
"Call a simple symmetric encryption tool\n"
msgstr ""
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s n�o � permitido com %s!\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "imposs�vel abrir %s: %s\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, fuzzy, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "%s: imposs�vel criar directoria: %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "imposs�vel abrir %s: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
msgid "no --program option provided\n"
msgstr ""
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr ""
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr ""
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "imposs�vel criar %s: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "imposs�vel criar %s: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr ""
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "imposs�vel criar `%s': %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "imposs�vel criar `%s': %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr ""
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
diff --cc po/ro.po
index d8c1b50,b1b1dd9..2e3238e
--- a/po/ro.po
+++ b/po/ro.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.4.2rc1\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2005-05-31 22:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <lbuz at rolix.org>\n"
"Language-Team: Romanian <translation-team-ro at lists.sourceforge.net>\n"
@@@ -105,14 -89,10 +105,14 @@@ msgstr "
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
#, fuzzy
msgid "Passphrase:"
msgstr "fraz�-parol� incorect�"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr ""
@@@ -157,92 -129,65 +157,92 @@@ msgstr "MPI incorect
msgid "Bad Passphrase"
msgstr "fraz�-parol� incorect�"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritm rezumat %d nu este suportat\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, 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:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
msgstr "nu pot deschide `%s': %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, fuzzy, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "nu am g�sit nici un inel de chei secret de scris: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, fuzzy, c-format
msgid "shadowing the key failed: %s\n"
msgstr "citirea cheii publice a e�uat: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, fuzzy, c-format
msgid "error writing key: %s\n"
msgstr "eroare la scrierea inelului de chei `%s': %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr ""
"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "schimb� fraza-parol�"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -250,7 -195,6 +250,7 @@@
msgstr ""
"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: am e�uat s� creez hashtable: %s\n"
@@@ -397,8 -315,6 +397,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "schimb� fraza-parol�"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -408,118 -324,87 +408,118 @@@ msgstr "
"Op�iuni:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "locvace"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "fii oarecum mai t�cut"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "caut� pentru chei pe un server de chei"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualizeaz� baza de date de �ncredere"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, 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:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "eroare la crearea frazei-parol�: %s\n"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
#, fuzzy
msgid "allow presetting passphrase"
msgstr "eroare la crearea frazei-parol�: %s\n"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "nu este suportat(�)"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -528,135 -413,93 +528,127 @@@ 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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Raporta�i bug-uri la <gnupg-bugs at gnu.org>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr ""
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "fi�ier op�iuni `%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, 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:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "nu pot crea `%s': %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
#, 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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "eroare la ob�inere noului PIN: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, 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:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "scriu cheia secret� �n `%s'\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, 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:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
msgstr "director `%s' creat\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "fstat(%d) a e�uat �n %s: %s\n"
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: nu pot crea director: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "eroare la citire `%s': %s\n"
@@@ -671,28 -512,22 +663,28 @@@ msgstr "
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2390
++#: agent/gpg-agent.c:2392
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "actualizarea secretului a e�uat: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: s�rit�: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
@@@ -708,8 -541,6 +700,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -717,9 -548,6 +709,9 @@@ msgstr "
"@Comenzi:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -740,25 -566,21 +732,25 @@@ msgid "
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr ""
"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr ""
"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
@@@ -766,17 -588,14 +758,17 @@@
msgstr ""
"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
#, fuzzy
msgid "cancelled\n"
msgstr "anulat�"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, fuzzy, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "eroare �n `%s': %s\n"
@@@ -948,42 -738,30 +940,42 @@@ msgstr "algoritm de protec�ie %d%s nu e
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "algoritm de protec�ie %d%s nu este suportat\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "eroare la citire `%s': %s\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "eroare la citire `%s': %s\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "eroare la citire `%s': %s\n"
@@@ -998,37 -774,15 +990,18 @@@ msgstr "eroare la ob�inerea informa�ie
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "nu m� pot conecta la `%s': %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "probleme de comunicare cu gpg-agent\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
#, fuzzy
msgid "problem setting the gpg-agent options\n"
msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- #, fuzzy
- msgid "canceled by user\n"
- msgstr "anulat� de utilizator\n"
-
- #: common/simple-pwquery.c:579
- #, fuzzy
- msgid "problem with the agent\n"
- msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "nu pot deactiva generarea fi�ierelor core: %s\n"
@@@ -1113,7 -850,6 +1086,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1138,17 -870,14 +1111,17 @@@ msgstr "
msgid "connection to agent is in restricted mode\n"
msgstr "nu pot face acest lucru �n modul batch\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr ""
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1443,7 -1112,6 +1416,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
#, fuzzy
msgid "out of core\n"
msgstr "nefor�at(�)"
@@@ -1502,7 -1159,10 +1475,13 @@@ msgstr "cheia public� %s nu a fost g�si
msgid "waiting for lock %s...\n"
msgstr "scriu cheia secret� �n `%s'\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr ""
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "armur�: %s\n"
@@@ -1746,10 -1351,6 +1725,10 @@@ msgstr "URL pentru a aduce cheia public
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Eroare: URL prea lung (limita este de %d caractere).\n"
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
@@@ -2036,27 -1572,18 +2015,27 @@@ msgstr "Nu sunt permise comenzi adminis
msgid "Invalid command (try \"help\")\n"
msgstr "Comand� invalid� (�ncerca�i \"ajutor\")\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output nu merge pentru aceast� comand�\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "nu pot deschide `%s'\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, 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:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "eroare la citire keyblock: %s\n"
@@@ -2118,39 -1633,32 +2097,39 @@@ msgstr "
"folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
"�nt�i.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "nu pot crea un pachet ESK simetric datorit� modului S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "folosesc cifrul %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' deja compresat\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "AVERTISMENT: `%s' este un fi�ier gol\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "citesc din `%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2158,7 -1666,6 +2137,7 @@@ msgstr "
"AVERTISMENT: for��nd cifrul simetric %s (%d) viola�i preferin�ele "
"destinatarului\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2167,17 -1674,14 +2146,17 @@@ msgstr "
"AVERTISMENT: for��nd algoritmul de compresie %s (%d) viola�i preferin�ele "
"destinatarului\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "for��nd cifrul simetric %s (%d) viola�i preferin�ele destinatarului\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrat pentru: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
@@@ -2290,8 -1773,6 +2269,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: s�rit�: %s\n"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2326,8 -1800,6 +2305,8 @@@ msgstr "eroare la creearea `%s': %s\n
msgid "[User ID not found]"
msgstr "[ID utilizator nu a fost g�sit]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "op�iuni enumerare invalide\n"
@@@ -2396,217 -1855,168 +2375,217 @@@ msgstr "Cheia invalid� %s f�cut� valid
msgid "using subkey %s instead of primary key %s\n"
msgstr "folosim subcheia %s �n loc de cheia primar� %s\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "|[fi�ier]|creaz� o semn�tur�"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
#, fuzzy
msgid "make a clear text signature"
msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "creaz� o semn�tur� deta�at�"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "cifreaz� datele"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "cifreaz� numai cu cifru simetric"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "decripteaz� datele (implicit)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verific� o semn�tur�"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "enumer� chei"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "enumer� chei �i semn�turi"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "list and check key signatures"
msgstr "enumer� �i verific� semn�turile cheii"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "enumer� chei �i amprente"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "enumer� chei secrete"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "genereaz� o nou� perechi de chei"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genereaz� o nou� perechi de chei"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genereaz� o nou� perechi de chei"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "genereaz� o nou� perechi de chei"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "genereaz� un certificat de revocare"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "�terge chei de pe inelul de chei public"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "�terge chei de pe inelul de chei secret"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "semneaz� o cheie"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "semneaz� o cheie local"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "semneaz� o cheie"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "semneaz� o cheie local"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "semneaz� sau editeaz� o cheie"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "schimb� fraza-parol�"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "export� chei"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "export� chei pentru un server de chei"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "import� chei de la un server de chei"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "caut� pentru chei pe un server de chei"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "actualizeaz� toate cheile de la un server de chei"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "import�/combin� chei"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr "afi�eaz� starea cardului"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr "schimb� data de pe card"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr "schimb� PIN-ul unui card"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "actualizeaz� baza de date de �ncredere"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
#, fuzzy
msgid "print message digests"
msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "creaz� ie�ire �n armur� ascii"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NUME|cifrare pentru NUME"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "folose�te modul text canonic"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "nu face nici o schimbare"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "�ntreab� �nainte de a suprascrie"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr "folose�te comportament strict OpenPGP"
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2614,7 -2024,6 +2593,7 @@@ msgstr "
"@\n"
"(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2634,13 -2043,11 +2613,13 @@@ msgstr "
" --list-keys [nume] arat� chei\n"
" --fingerprint [nume] arat� amprente\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2655,7 -2062,6 +2634,7 @@@ msgstr "
"sign, check, encrypt sau decrypt\n"
"opera�iunea implicit� depinde de datele de intrare\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2663,78 -2069,64 +2642,78 @@@ msgstr "
"\n"
"Algoritmuri suportate:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Cifru: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Compresie: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "folosire: gpg [op�iuni] "
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "comenzi �n conflict\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, fuzzy, c-format
#| msgid "no = sign found in group definition `%s'\n"
msgid "no = sign found in group definition '%s'\n"
msgstr "nu am g�sit nici un semn = �n defini�ia grupului `%s'\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr ""
"AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr ""
"AVERTISMENT: proprietate nesigur� (unsafe) pentru fi�ier configurare `%s'\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on extension `%s'\n"
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr ""
"AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr ""
"AVERTISMENT: permisiuni nesigure (unsafe) pentru fi�ier configurare `%s'\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on extension `%s'\n"
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@@ -2742,7 -2134,6 +2721,7 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
"directorul home `%s'\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2752,7 -2143,6 +2731,7 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
"configurare `%s'\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@@ -2760,7 -2150,6 +2739,7 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
"extensia `%s'\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@@ -2768,7 -2157,6 +2747,7 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
"directorul home `%s'\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2779,7 -2167,6 +2758,7 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
"configurare `%s'\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@@ -2787,516 -2174,401 +2766,511 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
"extensia `%s'\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "articol configurare necunoscut `%s'\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "arat� c�ruia dintre inelele de chei �i apar�ine o cheie enumerat�"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "deactiveaz� cheia"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "op�iune necunoscut� `%s'\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "op�iune necunoscut� `%s'\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, fuzzy, c-format
#| msgid "NOTE: old default options file `%s' ignored\n"
msgid "Note: old default options file '%s' ignored\n"
msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr ""
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, fuzzy, c-format
#| msgid "`%s' is not a valid signature expiration\n"
msgid "'%s' is not a valid signature expiration\n"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "Nu este o adres� de email valid�\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, fuzzy, c-format
#| msgid "`%s' is not a valid character set\n"
msgid "'%s' is not a valid character set\n"
msgstr "`%s' nu este un set de carectere valid\n"
#
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: op�iuni server de chei invalide\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
msgid "invalid keyserver options\n"
msgstr "op�iuni server de chei invalide\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: op�iuni import invalide\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "op�iuni import invalide\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "op�iuni enumerare invalide\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: op�iuni export invalide\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "op�iuni export invalide\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: op�iuni enumerare invalide\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
msgid "invalid list options\n"
msgstr "op�iuni enumerare invalide\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
#, fuzzy
msgid "show all notations during signature verification"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: op�iuni verificare invalide\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
msgid "invalid verify options\n"
msgstr "op�iuni verificare invalide\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nu pot seta cale-execu�ie ca %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: op�iuni verificare invalide\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s nu este permis cu %s!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nu are sens cu %s!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "nu va rula cu memorie neprotejat� (insecure) pentru c� %s\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritm cifrare selectat este invalid\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "algoritm rezumat selectat este invalid\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
msgid "selected compression algorithm is invalid\n"
msgstr "algoritm compresie selectat este invalid\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritm rezumat certificare selectat este invalid\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth trebuie s� fie �n intervalul de la 1 la 255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "preferin�e implicite invalide\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "preferin�e cifrare personale invalide\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "preferin�e rezumat personale invalide\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "preferin�e compresie personale invalide\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s nu merge �nc� cu %s!\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, fuzzy, c-format
#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "nu pute�i folosi algoritmul de cifrare `%s' c�t� vreme �n modul %s\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, fuzzy, c-format
#| msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "nu pute�i folosi algorimul de rezumat `%s' c�t� vreme �n modul %s\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, fuzzy, c-format
#| msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "nu pute�i folosi algoritmul de compresie `%s' c�t� vreme �n modul %s\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"AVERTISMENT: destinatari (-r) furniza�i f�r� a folosi cifrare cu cheie "
"public�\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [nume_fi�ier]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [nume_fi�ier]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, fuzzy, c-format
#| msgid "symmetric encryption of `%s' failed: %s\n"
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [nume_fi�ier]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [nume_fi�ier]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "nu pute�i folosi --symmetric --encrypt cu --s2k-mode 0\n"
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "nu pute�i folosi --symmetric --encrypt c�t� vreme �n modul %s\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [nume_fi�ier]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nume_fi�ier]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "nu pute�i folosi --symmetric --sign --encrypt cu --s2k-mode 0\n"
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "nu pute�i folosi --symmetric --sign --encrypt c�t� vreme �n modul %s\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nume_fi�ier]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [nume_fi�ier]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [nume_fi�ier]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key id-utilizator"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key id-utilizator"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-utilizator [comenzi]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id-utilizator"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "trimitere server de chei e�uat�: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recep�ie server de chei e�uat�: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "export cheie e�uat: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "export cheie e�uat: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "c�utare server de chei e�uat�: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualizare server de chei e�uat�: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminarea armurii a e�uat: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "punerea armurii a e�uat: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[nume_fi�ier]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "URL-ul politicii de certificare furnizat este invalid\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
@@@ -3340,333 -2604,267 +3314,333 @@@ msgstr "Nici un ajutor disponibil
msgid "No help available for '%s'"
msgstr "Nici un disponibil disponibil pentru `%s'"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "actualizeaz� baza de date de �ncredere"
- #: g10/import.c:143
++#: g10/import.c:147
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "actualizeaz� baza de date de �ncredere"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "afi�eaz� amprenta cheii"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:152
++#: g10/import.c:156
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "cheie secret� de nefolosit"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "bloc de tip %d s�rit\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu chei procesate p�n� acum\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Num�r total procesate: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " chei noi s�rite: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " chei noi s�rite: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " f�r� ID-uri utilizator: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importate: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " neschimbate: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " noi ID-uri utilizator: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " noi subchei: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " noi semn�turi: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " noi revoc�ri de chei: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chei secrete citite: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " chei secrete importate: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "chei secrete neschimbate: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " ne importate: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr "semn�turi create p�n� acum: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " chei secrete citite: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, fuzzy, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr "AVERTISMENT: cheia %s con�ine preferin�e pentru indisponibil\n"
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": preferin�� pentru algoritm de cifrare %s\n"
- #: g10/import.c:1042
++#: g10/import.c:1048
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": preferin�� pentru algoritm rezumat %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": preferin�� pentru algoritm compresie %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
"este puternic sugerat s� v� actualiza�i preferin�ele �i re-distribui�i\n"
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"aceast� cheie pentru a avita probleme poten�iale de ne-potrivire de "
"algoritm\n"
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "v� pute�i actualiza preferin�ele cu: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, c-format
msgid "key %s: no user ID\n"
msgstr "cheia %s: nici un ID utilizator\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "s�rit� \"%s\": %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1264
++#: g10/import.c:1343
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "cheia %s: subcheia HPK corupt� a fost reparat�\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "cheia %s: am acceptat ID-ul utilizator ce nu e auto-semnat \"%s\"\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "cheia %s: nici un ID utilizator valid\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "aceasta poate fi cauzat� de o auto-semn�tur� ce lipse�te\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "cheia %s: cheia public� nu a fost g�sit�: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "cheia %s: cheie nou� - s�rit�\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "n-am g�sit nici un inel de chei ce poate fi scris: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "eroare la scrierea inelului de chei `%s': %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "cheia %s: cheia public� \"%s\" importat�\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "cheia %s: nu se potrive�te cu copia noastr�\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "cheia %s: nu pot g�si keyblock-ul original: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "cheia %s: \"%s\" 1 nou� semn�tur�\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "cheia %s: \"%s\" 1 nou� subcheie\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "cheia %s: \"%s\" %d noi subchei\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "cheia %s: \"%s\" nu a fost schimbat�\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, c-format
msgid "key %s: secret key imported\n"
msgstr "cheia %s: cheie secret� importat�\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "s�rit�: cheia secret� deja prezent�\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key %s: %s\n"
msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
msgid "importing secret keys not allowed\n"
msgstr "importul de chei secrete nu este permis\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "cheia %s: cheie secret� cu cifru invalid %d - s�rit�\n"
@@@ -3681,142 -2879,115 +3655,142 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"cheia %s: nici o cheie public� - nu pot aplica certificatul de revocare\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "cheia %s: nici un ID utilizator pentru semn�tur�\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"cheia %s: algoritm cu cheie public� nesuportat pentru ID-ul utilizator \"%s"
"\"\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "cheia %s: auto-semn�tur� invalid� pentru ID-ul utilizator \"%s\"\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "cheia %s: legare subcheie invalid�\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "cheia %s: am �ters multiple leg�turi de subchei\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "cheia %s: nici o subcheie pentru revocare de cheie\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "cheia %s: revocare de subcheie invalid�\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "cheia %s: am �ters multiple revoc�ri de subcheie\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "cheia %s: am s�rit ID-ul utilizator \"%s\"\n"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "cheia %s: am s�rit subcheia\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "cheia %s: semn�tura nu poate fi exportat� (clasa 0x%02X) - s�rit�\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "cheia %s: certificat de revocare �ntr-un loc gre�it - s�rit\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "cheia %s: certificat de revocare invalid: %s - s�rit\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "cheia %s: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "AVERTISMENT: cheia %s poate fi revocat�: aduc revocarea cheii %s\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVERTISMENT: cheia %s poate fi revocat�: cheia de revocare %s nu este "
"prezent�.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "cheia %s: am ad�ugat certificatul de revocare \"%s\"\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
@@@ -4158,8 -3267,6 +4132,8 @@@ msgstr "Am verificat aceast� cheie foar
msgid "Really sign? (y/N) "
msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "semnarea a e�uat: %s\n"
@@@ -4636,13 -3641,9 +4610,13 @@@ msgstr "
"corect� dac� nu reporni�i programul.\n"
#
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
msgid "revoked"
msgstr "revocat�"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "expirat�"
@@@ -5599,13 -4422,11 +5573,13 @@@ msgstr " Amprent� cheie =
msgid " Card serial no. ="
msgstr " Card nr. serie ="
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "pun �n cache inelul de chei `%s'\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5613,14 -4434,12 +5587,14 @@@ msgid_plural "%lu keys cached so far (%
msgstr[0] "%lu chei puse �n cache p�n� acum (%lu semn�turi)\n"
msgstr[1] "%lu chei puse �n cache p�n� acum (%lu semn�turi)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5628,7 -4447,6 +5602,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 semn�tur� incorect�\n"
msgstr[1] "1 semn�tur� incorect�\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: inelul de chei creat\n"
@@@ -5847,118 -4620,99 +5821,124 @@@ msgstr "revocare standalone - folosi�i
msgid "no signature found\n"
msgstr "Semn�tur� bun� din \"%s\""
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, c-format
msgid "BAD signature from \"%s\""
msgstr "Semn�tur� INCORECT� din \"%s\""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Semn�tur� expirat� din \"%s\""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, c-format
msgid "Good signature from \"%s\""
msgstr "Semn�tur� bun� din \"%s\""
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "verificare semn�tur� eliminat�\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "nu pot m�nui aceste semn�turi multiple\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, c-format
msgid "Signature made %s\n"
msgstr "Semn�tur� f�cut� %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, c-format
msgid " using %s key %s\n"
msgstr " folosind cheia %s %s\n"
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Semn�tur� f�cut� %s folosind cheia %s cu ID %s\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ #| msgid " aka \"%s\""
+ msgid " issuer \"%s\"\n"
+ msgstr " aka \"%s\""
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "Cheie disponibil� la: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[nesigur]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, c-format
msgid " aka \"%s\""
msgstr " aka \"%s\""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "Semn�tur� expirat� %s\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "Semn�tura expir� %s\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "semn�tur� %s, algoritm rezumat %s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "binar"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "modtext"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "necunoscut"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritm pubkey necunoscut"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nu pot verifica semn�tura: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "nu o semn�tur� deta�at�\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"AVERTISMENT: am detectat multiple semn�turi. Numai prima va fi verificat�.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "semn�tur� de sine st�t�toare (standalone) de clas� 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
@@@ -6146,94 -4865,50 +6126,61 @@@ msgstr "
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpachetul de tip %d are bitul critic setat\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, c-format
- msgid " (main key ID %s)"
- msgstr " (ID cheie principal� %s)"
-
- #: g10/passphrase.c:277
- #, fuzzy, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pt. "
- "utilizator:\n"
- "\"%.*s\"\n"
- "cheia %u-bit %s, ID %s, creat� %s%s\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Introduce�i fraza-parol�\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "anulat� de utilizator\n"
- #: g10/passphrase.c:483
- #, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pentru\n"
- "utilizator: \"%s\"\n"
-
- #: g10/passphrase.c:491
- #, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "cheia %u-bit %s, ID %s, creat� %s"
-
- #: g10/passphrase.c:500
++#: g10/passphrase.c:489
#, c-format
- msgid " (subkey on main key ID %s)"
- msgstr " (subcheie pe cheia principal� ID %s)"
+ msgid " (main key ID %s)"
+ msgstr " (ID cheie principal� %s)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr ""
"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr ""
"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr ""
"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr ""
"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, fuzzy, c-format
#| msgid "%u-bit %s key, ID %s, created %s"
msgid ""
@@@ -6436,128 -5076,101 +6383,128 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "Folosi�i oricum aceast� cheie? (d/N) "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "AVERTISMENT: Folosi�i o cheie f�r� �ncredere!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr ""
"AVERTISMENT: aceast� cheie poate fi revocat� (cheia de revocare nu este "
"prezent�)\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "AVERTISMENT: Aceast� cheie a fost revocat� revocatorul desemnat!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
msgid " This could mean that the signature is forged.\n"
msgstr " Aceasta ar putea �nsemna c� semn�tura e falsificat�.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Not�: Aceast� cheie a fost deactivat�.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Not�: Aceast� cheie a expirat!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
"AVERTISMENT: Aceast� cheie nu este certificat� de o semn�tur� de �ncredere!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Nu exist� nici o indica�ie c� semn�tura apar�ine proprietarului.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVERTISMENT: Noi NU avem �ncredere �n aceast� cheie!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " Semn�tura este probabil un FALS.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"AVERTISMENT: Aceast� cheie nu este certificat� cu suficiente semn�turi de "
"�ncredere!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
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:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: s�rit�: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: s�rit�: cheia public� este deactivat�\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: s�rit�: cheia public� este deja prezent�\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/pkclist.c:991
++#: g10/pkclist.c:995
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/pkclist.c:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr "Destinatari curen�i:\n"
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6565,37 -5178,29 +6512,37 @@@ msgstr "
"\n"
"Introduce�i ID-ul utilizator. Termina�i cu o linie nou�: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Nu exist� acest ID utilizator.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
msgid "skipped: public key already set as default recipient\n"
msgstr "s�rit�: cheia public� setat� deja ca destinatar implicit\n"
- #: g10/pkclist.c:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "Cheia public� este deactivat�.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "s�rit�: cheia public� setat� deja\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatar implicit necunoscut \"%s\"\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "nici un destinatar valid\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, 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:1649
++#: g10/pkclist.c:1653
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "cheia %s nu are nici un ID utilizator\n"
@@@ -6881,7 -5434,6 +6828,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
msgstr[1] "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6961,12 -5504,10 +6908,12 @@@ msgstr "
"AVERTISMENT: nu pot %%-expanda URL-ul serverului de chei (prea mare). �l "
"folosesc neexpandat.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s semn�tur� de la: \"%s\"\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6974,11 -5515,9 +6921,11 @@@ msgstr "
"AVERTISMENT: for�area algoritmului rezumat %s (%d) violeaz� preferin�ele "
"destinatarului\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "semnare:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "va fi folosit� cifrarea %s\n"
@@@ -7086,7 -5605,6 +7033,7 @@@ msgstr "tranzac�ia trustdb prea mare\n
msgid "%s: directory does not exist!\n"
msgstr "%s: directorul nu exist�!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7199,151 -5695,118 +7146,143 @@@ msgstr "nu pot m�nui linii de text mai
msgid "input line longer than %d characters\n"
msgstr "linii de intrare mai lungi de %d caractere\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Algoritmuri suportate:\n"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: eroare scriere �nregistrare dir: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "eroare �n `%s': %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "eroare la ob�inere noului PIN: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Politica: "
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "eroare la ob�inere noului PIN: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "enumer� chei"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [fi�iere]|afi�eaz� rezumate mesaje"
msgstr[1] "|algo [fi�iere]|afi�eaz� rezumate mesaje"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7353,93 -5816,78 +7292,93 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
msgid "Verified %ld messages signed by \"%s\"."
msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7450,20 -5898,16 +7389,20 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7480,8 -5924,6 +7419,7 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
@@@ -8028,7 -6361,6 +7966,7 @@@ msgstr "|N|PIN Nou
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8084,16 -6405,13 +8022,16 @@@ msgid "
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8198,12 -6493,10 +8136,12 @@@ msgstr "
msgid "checking the CRL failed: %s"
msgstr "verificarea semn�turii create a e�uat: %s\n"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr ""
@@@ -8216,7 -6507,6 +8154,7 @@@ msgstr "exportul cheilor secrete nu est
msgid "intermediate certificate not yet valid"
msgstr ""
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
#, fuzzy
msgid "certificate has expired"
msgstr "Aceast� cheie a expirat!"
@@@ -8273,7 -6552,6 +8211,7 @@@ msgstr "certificat incorect
msgid " ( issuer valid from "
msgstr " Card nr. serie ="
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "Amprenta CA: "
@@@ -8303,7 -6575,6 +8241,7 @@@ msgstr "genereaz� un certificat de revo
msgid "self-signed certificate has a BAD signature"
msgstr ""
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr ""
@@@ -8312,29 -6582,23 +8250,29 @@@
msgid "checking the trust list failed: %s\n"
msgstr "verificarea semn�turii create a e�uat: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr ""
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr ""
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "verific� o semn�tur�"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr ""
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
#, fuzzy
msgid "certificate is good\n"
msgstr "preferin�a `%s' duplicat�\n"
@@@ -8367,7 -6625,6 +8305,7 @@@ msgstr "
msgid "(this is the MD2 algorithm)\n"
msgstr ""
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
#, fuzzy
msgid "none"
msgstr "nu"
@@@ -8404,36 -6656,28 +8342,36 @@@ msgstr "
"\"%.*s\"\n"
"cheia %u-bit %s, ID %s, creat� %s%s\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr ""
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr ""
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr ""
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr ""
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr ""
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr ""
@@@ -8878,22 -7032,18 +8816,22 @@@ msgid "%s:%u: skipping this line\n
msgstr " s = s�ri peste cheia asta\n"
#
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "nu pot accesa `%s': %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8956,7 -7094,6 +8894,7 @@@ msgstr "rev? probleme la verificare rev
msgid "error storing flags: %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr ""
@@@ -9073,99 -7189,74 +9011,93 @@@ msgstr "
msgid "dropping %u certificates from the cache\n"
msgstr ""
- #: dirmngr/certcache.c:352
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
- msgid "can't access directory '%s': %s\n"
- msgstr "nu pot crea directorul `%s': %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't parse certificate '%s': %s\n"
msgstr "nu pot crea `%s': %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, fuzzy, c-format
msgid "certificate '%s' already cached\n"
msgstr "preferin�a `%s' duplicat�\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, fuzzy, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "Certificat de revocare creat.\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, fuzzy, c-format
msgid "certificate '%s' loaded\n"
msgstr "preferin�a `%s' duplicat�\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, fuzzy, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr "Amprenta CA: "
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, fuzzy, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, fuzzy, c-format
msgid "permanently loaded certificates: %u\n"
msgstr "certificat incorect"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, fuzzy, c-format
msgid " runtime cached certificates: %u\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
#, fuzzy
msgid "certificate already cached\n"
msgstr "Certificat de revocare creat.\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
#, fuzzy
msgid "certificate cached\n"
msgstr "preferin�a `%s' duplicat�\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "amprent� invalid�"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, fuzzy, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, fuzzy, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
#, fuzzy
msgid "no issuer found in certificate\n"
msgstr "genereaz� un certificat de revocare"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, fuzzy, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "eroare la ob�inere noului PIN: %s\n"
@@@ -9431,7 -7471,6 +9363,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "eroare la ob�inere noului PIN: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
@@@ -9453,7 -7489,6 +9385,7 @@@ msgstr "r�spuns invalid de la agent\n
msgid "converting S-expression failed: %s\n"
msgstr "nu pot deschide fi�ierul: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "citirea cheii publice a e�uat: %s\n"
@@@ -9855,118 -7810,87 +9787,114 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr ""
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
#, 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:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
#
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9979,95 -7903,76 +9907,95 @@@ msgstr "
"@\n"
"(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "folosire: gpg [op�iuni] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
#, 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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, 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:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "linie prea lung�"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "amprent� invalid�"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, 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:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "nefor�at(�)"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10421,104 -8256,83 +10349,104 @@@ msgstr "verificarea semn�turii create
msgid "not signed by a default OCSP signer's certificate"
msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, fuzzy, c-format
msgid "allocating list item failed: %s\n"
msgstr "citirea cheii publice a e�uat: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error getting responder ID: %s\n"
msgstr "eroare la ob�inere noului PIN: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr ""
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, fuzzy, c-format
msgid "issuer certificate not found: %s\n"
msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr ""
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
#, fuzzy
msgid "caller did not return the issuing certificate\n"
msgstr "genereaz� un certificat de revocare"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, fuzzy, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "am e�uat s� stochez cheia: %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, fuzzy, c-format
#| msgid "%s: can't access: %s\n"
msgid "can't get authorityInfoAccess: %s\n"
msgstr "%s: nu pot accesa: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
#, fuzzy
#| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
msgstr "nici un inel de chei secrete implicit: %s\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr ""
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, fuzzy, c-format
#| msgid "using cipher %s\n"
msgid "using OCSP responder '%s'\n"
msgstr "folosesc cifrul %s\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, fuzzy, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, fuzzy, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "NOT�: cheia a fost revocat�"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr ""
@@@ -10566,34 -8370,28 +10494,34 @@@ msgstr "stergere keyblock a e�uat: %s\n
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, 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:2415
++#: dirmngr/server.c:2377
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: am e�uat s� creez hashtable: %s\n"
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, 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:2444
++#: dirmngr/server.c:2406
#, 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:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10618,34 -8412,24 +10546,30 @@@ msgstr "
msgid "checking CRL for"
msgstr "verificarea semn�turii create a e�uat: %s\n"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
#, fuzzy
msgid "selfsigned certificate has a BAD signature"
msgstr "verific� o semn�tur�"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, fuzzy, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "verificarea semn�turii create a e�uat: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
#, fuzzy
msgid "certificate chain is good\n"
msgstr "preferin�a `%s' duplicat�\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA necesit� folosirea unui algoritm cu hash de 160 bi�i\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "termin�"
@@@ -10773,11 -8526,9 +10697,11 @@@ msgstr "
msgid "Options enforcing a passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
@@@ -10918,85 -8637,66 +10842,85 @@@ msgstr "
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
#, fuzzy
msgid "list global configuration file"
msgstr "articol configurare necunoscut `%s'\n"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
#, fuzzy
msgid "check global configuration file"
msgstr "articol configurare necunoscut `%s'\n"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "folose�te ca fi�ier ie�ire"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
#, fuzzy
msgid "Component not found"
msgstr "cheia public� nu a fost g�sit�"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
#, fuzzy
msgid "No argument allowed"
msgstr "Nu sunt permise comenzi administrare\n"
@@@ -11050,123 -8741,98 +10974,123 @@@ msgid "
"Call a simple symmetric encryption tool\n"
msgstr ""
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s nu este permis cu %s!\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "fstat pentru `%s' a e�uat �n %s: %s\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, fuzzy, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "nu pot crea directorul `%s': %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "nu pot deschide %s: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "eroare la scrierea inelului de chei `%s': %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "eroare �n `%s': %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
#, fuzzy
msgid "no --program option provided\n"
msgstr "nu este suportat� execu�ia nici unui program la distan��\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr ""
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr ""
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "nu pot crea `%s': %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "nu pot crea `%s': %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr ""
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "nu pot deschide fi�ierul: %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr ""
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "algoritm rezumat %d nu este suportat\n"
diff --cc po/ru.po
index 8b1a9b0,fc12908..098e315
--- a/po/ru.po
+++ b/po/ru.po
@@@ -11,8 -11,7 +11,8 @@@ msgid "
msgstr ""
"Project-Id-Version: GnuPG 2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
- "PO-Revision-Date: 2016-06-20 17:17+0000\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
+ "PO-Revision-Date: 2016-07-17 17:17+0000\n"
"Last-Translator: Ineiev <ineiev at gnu.org>\n"
"Language-Team: Russian <gnupg-ru at gnupg.org>\n"
"Language: ru\n"
@@@ -104,13 -88,9 +104,13 @@@ msgstr "
msgid "PIN:"
msgstr "PIN:"
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
msgid "Passphrase:"
msgstr "Фраза-пароль:"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr "не подходит - попробуйте еще раз"
@@@ -150,64 -122,42 +150,64 @@@ msgstr "Неверный PIN
msgid "Bad Passphrase"
msgstr "Неверная фраза-пароль"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ключи ssh длиннее %d бит не поддерживаются\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, c-format
msgid "can't create '%s': %s\n"
msgstr "не могу создать '%s': %s\n"
- #: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, c-format
msgid "can't open '%s': %s\n"
msgstr "не могу открыть '%s': %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "ошибка получения серийного номера карты: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "обнаружена карта, серийный номер: %s\n"
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "на карте нет основного аутентификационного ключа для ssh: %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "на карте не найдено подходящего ключа: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, c-format
msgid "shadowing the key failed: %s\n"
msgstr "сбой при затенении ключа: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, c-format
msgid "error writing key: %s\n"
msgstr "ошибка записи ключа: %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -216,24 -166,19 +216,24 @@@ msgstr "
"Процесс ssh запросил доступ к ключу%%0A %s%%0A (%s)%%0AВы хотите это "
"позволить?"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr "Позволить"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr "Отказать"
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Введите фразу-пароль для ключа ssh%%0A %F%%0A (%c)"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Повторите фразу-пароль:"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -242,7 -187,6 +242,7 @@@ msgstr "
"Введите фразу-пароль для защиты полученного секретного ключа%%0A %s%%0A "
"%s%%0Aвнутри хранилища ключей агента gpg"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "сбой создания потока из сокета: %s\n"
@@@ -383,8 -301,6 +383,8 @@@ msgstr "Введите фразу-па�
msgid "Please enter the new passphrase"
msgstr "Введите новую фразу-пароль"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -392,129 -308,91 +392,129 @@@ msgstr "
"@Параметры:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr "запуск в режиме демона (фоновый режим)"
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr "запуск в режиме сервера (нефоновый режим)"
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "подробно"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "сократить подробности"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr "вывод команд в стиле sh"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr "вывод команд в стиле csh"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FILE|взять параметры из файла FILE"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr "не отсоединяться от консоли"
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr "не захватывать клавиатуру и мышь"
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "использовать файл журнала для сервера"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|использовать программу PGM для ввода паролей"
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|использовать программу PGM как демон криптографических карт"
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
msgid "do not use the SCdaemon"
msgstr "не использовать демон криптографических карт"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|принимать некоторые команды по NAME"
- #: agent/gpg-agent.c:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr "игнорировать запросы смены терминала"
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr "игнорировать запросы смены дисплея XWindow"
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|сбрасывать запомненный PIN через N секунд"
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr "не использовать запомненный PIN при подписывании"
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
msgid "disallow the use of an external password cache"
msgstr "не позволять пользоваться внешней памятью паролей"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr "не позволять клиентам помечать ключи как \"доверенные\""
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
msgid "allow presetting passphrase"
msgstr "разрешить предустанавливать фразу-пароль"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
"не позволять вызывающей программе замещать собой программу ввода пароля"
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr "разрешить ввод фразы-пароля через Emacs"
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
msgid "enable ssh support"
msgstr "включить поддержку ssh"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Об ошибках в программе сообщайте по адресу <@EMAIL@>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Вызов: @GPG_AGENT@ [параметры] (-h для подсказки)"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -522,107 -400,72 +522,99 @@@ msgstr "
"Синтаксис: @GPG_AGENT@ [параметры] [команда [аргументы]]\n"
"Управление секретными ключами для @GNUPG@\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "запрошен недопустимый уровень отладки '%s'\n"
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr "слишком старая версия %s (нужно %s, есть %s)\n"
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "Замечание: основной файл параметров '%s' не обнаружен\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, c-format
msgid "option file '%s': %s\n"
msgstr "файл параметров '%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, c-format
msgid "reading options from '%s'\n"
msgstr "чтение параметров из '%s'\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Замечание: '%s' не считается параметром\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, c-format
msgid "can't create socket: %s\n"
msgstr "не могу создать сокет: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "слишком длинное имя сокета '%s'\n"
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "агент gpg уже запущен - еще один, новый, запущен не будет\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
msgid "error getting nonce for the socket\n"
msgstr "ошибка получения разового кода для сокета\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "ошибка связывания сокета с '%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "не удалось задать права доступа для '%s': %s\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, c-format
msgid "listen() failed: %s\n"
msgstr "сбой listen(): %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, c-format
msgid "listening on socket '%s'\n"
msgstr "слушаем сокет '%s'\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "не могу создать каталог '%s': %s\n"
- #: agent/gpg-agent.c:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "создан каталог '%s'\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "сбой stat() для '%s': %s\n"
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "невозможно использовать '%s' как домашний каталог\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "ошибка чтения разового кода из файлового дескриптора %d: %s\n"
@@@ -637,28 -478,22 +629,28 @@@ msgstr "обработчик 0x%lx дл
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "обработчик 0x%lx для файлового дескриптора %d завершился\n"
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "обработчик ssh 0x%lx для файлового дескриптора %d запущен\n"
- #: agent/gpg-agent.c:2390
++#: agent/gpg-agent.c:2392
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "обработчик ssh 0x%lx для файлового дескриптора %d завершился\n"
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "сбой npth_pselect: %s - жду 1 секунду\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s остановлен\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "в этом сеансе агент gpg не работает\n"
@@@ -675,8 -508,6 +667,8 @@@ msgstr "
"Синтаксис: gpg-preset-passphrase [параметры] КОД_КЛЮЧА\n"
"Работа с буфером паролей\n"
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -684,9 -515,6 +676,9 @@@ msgstr "
"@Команды:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -708,22 -534,18 +700,22 @@@ msgstr "
"Синтаксис: gpg-protect-tool [параметры] [аргументы]\n"
"Средство работы с секретными ключами\n"
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Введите фразу-пароль для снятия защиты с объекта PKCS#12."
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Введите фразу-пароль для защиты нового объекта PKCS#12."
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
"Введите фразу-пароль для защиты импортированных объектов в системе GnuPG."
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -731,16 -553,13 +723,16 @@@ msgstr "
"Введите фразу-пароль или PIN,\n"
"необходимые для выполнения данной операции."
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
msgid "cancelled\n"
msgstr "отменено\n"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "ошибка запроса ввода фразы-пароля: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, c-format
msgid "error opening '%s': %s\n"
msgstr "ошибка открытия '%s': %s\n"
@@@ -911,42 -701,30 +903,42 @@@ msgstr "алгоритм защиты %
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "хеш-функция защиты %d (%s) не поддерживается\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "ошибка при создании канала конвейера: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "ошибка при создании потока для канала конвейера: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, c-format
msgid "error forking process: %s\n"
msgstr "ошибка при дублировании процесса: %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "сбой при ожидании завершения процесса: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr "ошибка выполнения '%s': возможно, не установлен\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "ошибка выполнения '%s': статус завершения %d\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, c-format
msgid "error running '%s': terminated\n"
msgstr "ошибка выполнения '%s': прервано\n"
@@@ -961,33 -737,13 +953,16 @@@ msgstr "ошибка получени�
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "сбой при ожидании завершения процесса %d: %s\n"
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "не могу подключиться к '%s': %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "проблема связи с агентом gpg\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
msgid "problem setting the gpg-agent options\n"
msgstr "проблема задания параметров агента gpg\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- msgid "canceled by user\n"
- msgstr "прервано пользователем\n"
-
- #: common/simple-pwquery.c:579
- msgid "problem with the agent\n"
- msgstr "проблема с агентом\n"
-
- #: common/simple-pwquery.c:701
- #, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "проблема с агентом (неожиданный ответ \"%s\")\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "не могу отключить создание файла образа памяти: %s\n"
@@@ -1072,7 -811,6 +1047,7 @@@ msgstr "%s:%u: устаревший п�
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "Внимание: параметр \"%s%s\" устарел - он игнорируется\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr "неизвестный отладочный флаг '%s' игнорируется\n"
@@@ -1095,17 -829,14 +1070,17 @@@ msgstr "соединение с аге�
msgid "connection to agent is in restricted mode\n"
msgstr "соединение с агентом в ограниченном режиме\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr "Dirmngr не выполняется - запуск '%s'\n"
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "ожидаю подключения dirmngr ... (%iс)\n"
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr "соединение с dirmngr установлено\n"
@@@ -1363,7 -1034,6 +1338,7 @@@ msgstr "параметр \"%.50s\" не
msgid "command \"%.50s\" is ambiguous\n"
msgstr "команда \"%.50s\" неоднозначна\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
msgid "out of core\n"
msgstr "нехватка выделенной памяти\n"
@@@ -1421,7 -1080,10 +1396,13 @@@ msgstr "блокировка '%s' не
msgid "waiting for lock %s...\n"
msgstr "ожидаю снятия блокировки %s...\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr "слишком старая версия %s (нужно %s, есть %s)\n"
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "текстовый формат: %s\n"
@@@ -1650,10 -1257,6 +1631,10 @@@ msgstr "URL для получения �
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Ошибка: Слишком длинный URL (предел - %d символов).\n"
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, c-format
msgid "error reading '%s': %s\n"
msgstr "ошибка чтения '%s': %s\n"
@@@ -1933,26 -1471,17 +1914,26 @@@ msgstr "Команды админист
msgid "Invalid command (try \"help\")\n"
msgstr "Недопустимая команда (список команд: \"help\")\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output для данной команды не работает\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "не могу открыть '%s'\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "ключ \"%s\" не найден: %s\n"
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "ошибка чтения блока ключей: %s\n"
@@@ -2009,36 -1526,29 +1990,36 @@@ msgstr "имеется секретны
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "сначала удалите его командой \"--delete-secret-keys\".\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "ошибка при создании фразы-пароля: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "не могу использовать симметричный пакет ESK из-за режима S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "используется симметричный шифр %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, c-format
msgid "'%s' already compressed\n"
msgstr "'%s' уже сжат\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "Внимание: файл '%s' пуст\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, c-format
msgid "reading from '%s'\n"
msgstr "чтение из '%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2046,26 -1556,22 +2027,26 @@@ msgstr "
"Внимание: принудительное использование симметричного шифра %s (%d)\n"
" нарушает предпочтения получателя\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "Внимание: сжатие алгоритмом %s (%d) нарушает предпочтения получателя\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"принудительное использование симметричного шифра %s (%d) нарушает "
"предпочтения получателя\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s зашифровано для: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "нельзя использовать %s в режиме %s\n"
@@@ -2168,8 -1653,6 +2149,8 @@@ msgstr "при экспорте уда�
msgid " - skipped"
msgstr " - пропущено"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, c-format
msgid "writing to '%s'\n"
msgstr "сохраняю в '%s'\n"
@@@ -2202,8 -1678,6 +2183,8 @@@ msgstr "ошибка создания '
msgid "[User ID not found]"
msgstr "[ID пользователя не найден]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(проверьте аргумент параметра '%s')\n"
@@@ -2273,201 -1734,150 +2254,199 @@@ msgstr "
msgid "using subkey %s instead of primary key %s\n"
msgstr "использую подключ %s вместо первичного ключа %s\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
msgid "make a signature"
msgstr "создать подпись"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
msgid "make a clear text signature"
msgstr "создать текстовую подпись"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "создать отделенную подпись"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "зашифровать данные"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "шифрование только симметричным шифром"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "расшифровать данные (по умолчанию)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "проверить подпись"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "вывести список ключей"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "вывести список ключей и подписей"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "list and check key signatures"
msgstr "вывести и проверить подписи ключей"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "вывести список ключей и их отпечатков"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "вывести список секретных ключей"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "создать новую пару ключей"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
msgid "quickly generate a new key pair"
msgstr "быстро создать новую пару ключей"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
msgid "quickly add a new user-id"
msgstr "быстро добавить новый ID пользователя"
- #: g10/gpg.c:442
- #, fuzzy
- #| msgid "quickly add a new user-id"
++#: g10/gpg.c:445
msgid "quickly revoke a user-id"
- msgstr "быстро добавить новый ID пользователя"
+ msgstr "быстро отозвать ID пользователя"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr "создание полноценной пары ключей"
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "создать сертификат отзыва"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "удалить ключи из таблицы открытых ключей"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "удалить ключи из таблицы секретных ключей"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
msgid "quickly sign a key"
msgstr "быстро подписать ключ"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
msgid "quickly sign a key locally"
msgstr "быстро подписать ключ локально"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "подписать ключ"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "подписать ключ локально"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "подписать или редактировать ключ"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "сменить фразу-пароль"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "экспортировать ключи"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "экспортировать ключи на сервер ключей"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "импортировать ключи с сервера ключей"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "искать ключи на сервере ключей"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "обновить все ключи с сервера ключей"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "импортировать/объединить ключи"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr "показать состояние карты"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr "изменить данные на карте"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr "сменить PIN карты"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "обновить таблицу доверия"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
msgid "print message digests"
msgstr "вывести хеши сообщений"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "запуск в режиме сервера"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|VALUE|установить правила TOFU для ключа"
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "вывод в текстовом формате"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|зашифровать для пользователя USER-ID"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|использовать ключ USER-ID для подписи и расшифровки"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|установить уровень сжатия N (0 - без сжатия)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "использовать канонический текстовый режим"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FILE|выводить данные в файл FILE"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "не делать никаких изменений"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "спросить перед перезаписью"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr "строго следовать стандарту OpenPGP"
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2475,7 -1885,6 +2454,7 @@@ msgstr "
"@\n"
"(Полный список команд и параметров см. на странице man)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2495,11 -1904,9 +2474,11 @@@ msgstr "
" --list-keys [имена] показать ключи\n"
" --fingerprint [имена] показать отпечатки\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Вызов: @GPG@ [параметры] [файлы] (-h для подсказки)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2509,7 -1916,6 +2488,7 @@@ msgstr "
"Подписи и их проверка, шифрование и расшифровка\n"
"Действие по умолчанию зависит от входных данных\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2517,94 -1923,76 +2496,94 @@@ msgstr "
"\n"
"Поддерживаются следующие алгоритмы:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "С открытым ключом: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Симметричные шифры: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Хеш-функции: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Алгоритмы сжатия: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "вызов: %s [параметры] %s\n"
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "несовместимые команды\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "в определении группы '%s' отсутствует знак =\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "Внимание: небезопасный владелец домашнего каталога '%s'\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "Внимание: небезопасный владелец файла настроек '%s'\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "Внимание: небезопасный владелец файла модуля расширения '%s'\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "Внимание: небезопасные права доступа к домашнему каталогу '%s'\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "Внимание: небезопасные права доступа к файлу настроек '%s'\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "Внимание: небезопасные права доступа к файлу модуля расширения '%s'\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"Внимание: небезопасный владелец каталога, содержащего домашний каталог '%s'\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr ""
"Внимание: небезопасный владелец каталога, содержащего файл настроек '%s'\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"Внимание: небезопасный владелец каталога,\n"
" содержащего модуль расширения '%s'\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"Внимание: небезопасные права доступа к каталогу,\n"
" содержащему домашний каталог '%s'\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2612,499 -2000,383 +2591,494 @@@ msgstr "
"ВНИМАНИЕ: небезопасные права доступа к каталогу,\n"
" содержащему файл настроек '%s'\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"Внимание: небезопасные права доступа к каталогу,\n"
" содержащему файл модуля расширения '%s'\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "неизвестный элемент в файле настроек '%s'\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr "показать в списке ключей фотоидентификаторы"
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
msgid "show key usage information during key listings"
msgstr "показать в списке ключей сведения о назначении ключа"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr "показать в списке подписей URL правил"
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
msgid "show all notations during signature listings"
msgstr "показать в списке подписей все замечания"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr "показать в списке подписей замечания стандарта IETF"
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr "показать в списке подписей пользовательские замечания"
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
msgid "show preferred keyserver URLs during signature listings"
msgstr "показать в списке подписей URL предпочтительных серверов ключей"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr "показать в списке ключей действительность ID пользователей"
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr "показать в списке ключей отозванные и просроченные ID пользователей"
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr "показать в списке ключей отозванные и просроченные подключи"
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
msgid "show the keyring name in key listings"
msgstr "показать в списке ключей название таблицы ключей"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
msgid "show expiration dates during signature listings"
msgstr "показать в списке подписей сроки действия"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
msgid "available TOFU policies:\n"
msgstr "Доступные правила TOFU:\n"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "неизвестные правила TOFU '%s'\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr "(\"help\" выведет список вариантов)\n"
- #: g10/gpg.c:2041
- #, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "неизвестный формат базы данных TOFU '%s'\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "Замечание: старый основной файл параметров '%s' проигнорирован\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr "слишком старая версия libcrypt (нужно %s, есть %s)\n"
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "Замечание: %s не предназначен для нормального применения!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s' - не допустимый срок действия подписи\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ #| msgid "line %d: not a valid email address\n"
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "строка %d: нет допустимого адреса электронной почты\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "недопустимый режим ввода пароля '%s'\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "'%s' - не допустимая таблица символов\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "не могу интерпретировать URL сервера ключей\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: недопустимые параметры сервера ключей\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
msgid "invalid keyserver options\n"
msgstr "недопустимые параметры сервера ключей\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: недопустимые параметры импорта\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "недопустимые параметры импорта\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
- #, fuzzy, c-format
- #| msgid "invalid list options\n"
++#: g10/gpg.c:3061 g10/gpg.c:3076
+ #, c-format
msgid "invalid filter option: %s\n"
- msgstr "недопустимые параметры списка\n"
+ msgstr "недопустимый параметр фильтра: %s\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: недопустимые параметры экспорта\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "недопустимые параметры экспорта\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: недопустимые параметры списка\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
msgid "invalid list options\n"
msgstr "недопустимые параметры списка\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr "показать при проверке подписи фотоидентификаторы"
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr "показать при проверке подписи URL правил"
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
msgid "show all notations during signature verification"
msgstr "показать при проверке подписей все замечания"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr "показать при проверке подписей замечания стандарта IETF"
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr "показать при проверке подписей пользовательские замечания"
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
msgid "show preferred keyserver URLs during signature verification"
msgstr "показать при проверке подписей URL предпочтительных серверов ключей"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
msgid "show user ID validity during signature verification"
msgstr "показать при проверке подписей действительность ID пользователей"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"показать при проверке подписей отозванные и просроченные ID пользователя"
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
msgid "show only the primary user ID in signature verification"
msgstr "показать при проверке подписей только первичный ID пользователя"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr "проверить подписи по данным PKA"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr "поднять доверие подписей по действительным данным PKA"
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: недопустимые параметры проверки\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
msgid "invalid verify options\n"
msgstr "недопустимые параметры проверки\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "не могу определить путь запуска для %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: недопустимый список auto-key-locate\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr "недопустимый список auto-key-locate\n"
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "Внимание: возможно создание файла образа памяти!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "Внимание: %s отменяет %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s с %s недопустимо!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s с %s не имеет смысла!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr "Внимание: работаем с фальшивым системным временем: "
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "не будет работать с небезопасной памятью из-за %s\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "выбран недопустимый алгоритм шифрования\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "выбрана недопустимая хеш-функция\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
msgid "selected compression algorithm is invalid\n"
msgstr "выбран недопустимый алгоритм сжатия\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "выбрана недопустимая хеш-функция для сертификации\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed должен быть больше 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed должен быть больше 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Замечание: простой режим S2K (0) строго противопоказан\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "недопустимые предпочтения по умолчанию\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "недопустимые личные предпочтения шифра\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "недопустимые личные предпочтения хеш-функции\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "недопустимые личные предпочтения алгоритмов сжатия\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s пока не работает совместно с %s!\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "шифрование '%s' в режиме %s использовать нельзя\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "хеш-функцию '%s' в режиме %s использовать нельзя\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "сжатие '%s' в режиме %s использовать нельзя\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "сбой инициализации таблицы доверия: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
"ключом\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [файл]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [файл]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "сбой симметричного шифрования '%s': %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [файл]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [файл]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --encrypt нельзя использовать совместно с --s2k-mode 0\n"
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "в режиме %s нельзя использовать --symmetric --encrypt\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [файл]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [файл]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [файл]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "в режиме %s нельзя использовать --symmetric --sign --encrypt\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [файл]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [файл]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [файл]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key <ID пользователя>"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key <ID пользователя>"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key <ID пользователя> [команды]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
msgid "--passwd <user-id>"
msgstr "--passwd <ID пользователя>"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "сбой при отправке на сервер ключей: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "сбой при получении с сервера ключей: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "сбой при экспорте ключа: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "сбой при экспорте в виде ключа ssh: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "сбой при поиске на сервере ключей: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "сбой при обновлении с сервера ключей: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ошибка преобразования из текстового формата: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ошибка преобразования в текстовый формат: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "недопустимая хеш-функция '%s'\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "ошибка синтаксического анализа спецификации ключа '%s': %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr "'%s' не является идентификатором, отпечатком или кодом ключа\n"
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[файл]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Пишите сообщение ...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "заданный URL правил сертификации неверен\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "заданный URL правил подписи неверен\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
msgid "the given preferred keyserver URL is invalid\n"
msgstr "заданный URL предпочтительного сервера ключей неверен\n"
@@@ -3145,135 -2409,105 +3119,133 @@@ msgstr "Справки нет
msgid "No help available for '%s'"
msgstr "Нет справки для '%s'"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr "импортировать подписи, обозначенные как 'только локальные'"
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr "устранить при импорте повреждения от сервера ключей pks"
- #: g10/import.c:140
++#: g10/import.c:144
msgid "do not clear the ownertrust values during import"
msgstr "не сбрасывать уровни доверия владельцам после импорта"
- #: g10/import.c:143
++#: g10/import.c:147
msgid "do not update the trustdb after import"
msgstr "не обновлять таблицу доверия после импорта"
- #: g10/import.c:146
- #, fuzzy
- #| msgid "show key fingerprint"
++#: g10/import.c:150
msgid "show key during import"
- msgstr "показать отпечаток ключа"
+ msgstr "показывать ключ во время импорта"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr "обновлять только существующие ключи"
- #: g10/import.c:152
++#: g10/import.c:156
msgid "remove unusable parts from key after import"
msgstr "удалить после импорта непригодные части ключа"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr "удалить после импорта из ключа как можно больше"
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
- msgstr ""
+ msgstr "применить фильтры импорта и немедленно экспортировать ключ"
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "пропущен блок типа %d\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, c-format
msgid "%lu keys processed so far\n"
msgstr "обработано %lu ключей\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Всего обработано: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " пропущено ключей PGP-2: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " пропущено новых ключей: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " без ID пользователя: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " импортировано: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " неизмененных: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " новых ID пользователя: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " новых подключей: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " новых подписей: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " новых отзывов ключей: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " прочитано секретных ключей: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "импортировано секретных ключей: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " неизмененных секретных ключей: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " не импортировано: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " очищено подписей: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " очищено ID пользователей: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3282,189 -2516,151 +3254,189 @@@ msgstr "
"Внимание: ключ %s содержит предпочтения для недоступных\n"
"алгоритмов для следующих ID пользователей:\n"
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": предпочитает шифр %s\n"
- #: g10/import.c:1042
++#: g10/import.c:1048
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": предпочитает хеш-функцию %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": предпочитает алгоритм сжатия %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "крайне желательно, чтобы Вы обновили свои предпочтения и\n"
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"распространили этот ключ во избежание возможных нестыковок алгоритмов\n"
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"свои предпочтения можно обновить командой gpg --edit-key %s updpref save\n"
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, c-format
msgid "key %s: no user ID\n"
msgstr "ключ %s: нет ID пользователя\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, c-format
msgid "key %s: %s\n"
msgstr "ключ %s: %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr "исключен фильтром импорта"
- #: g10/import.c:1264
++#: g10/import.c:1343
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "ключ %s: повреждение подключа PKS исправлено\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "ключ %s: принят без самозаверенного ID пользователя \"%s\"\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "ключ %s: нет действительных ID пользователя\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "может быть, из-за отсутствия самоподписи\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "ключ %s: не найден открытый ключ: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "ключ %s: новый ключ - пропущен\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "нет доступной для записи таблицы ключей: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "ошибка записи таблицы ключей '%s': %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "ключ %s: импортирован открытый ключ \"%s\"\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "ключ %s: не совпадает с нашей копией\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "ключ %s: оригинальный блок ключей не найден: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "ключ %s: оригинальный блок ключей не читается: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "ключ %s: \"%s\" 1 новый ID пользователя\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "ключ %s: \"%s\" %d новых ID пользователя\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "ключ %s: \"%s\" 1 новая подпись\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "ключ %s: \"%s\" %d новых подписей\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "ключ %s: \"%s\" 1 новый подключ\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "ключ %s: \"%s\" %d новых подключей\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "ключ %s: \"%s\" %d подпись очищена\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "ключ %s: \"%s\" %d подписей очищено\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "ключ %s: \"%s\" %d ID пользователя очищен\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "ключ %s: \"%s\" %d ID пользователя очищено\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "ключ %s: \"%s\" не изменен\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, c-format
msgid "key %s: secret key imported\n"
msgstr "ключ %s: импортирован секретный ключ\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "ключ %s: секретный ключ уже имеется\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "ключ %s: ошибка отправки в агент: %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, c-format
msgid "secret key %s: %s\n"
msgstr "секретный ключ %s: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
msgid "importing secret keys not allowed\n"
msgstr "импорт секретного ключа не допускается\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
@@@ -3479,139 -2675,112 +3451,139 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr "Для переноса '%s' выполните на каждой криптографической карте: %s\n"
- #: g10/import.c:2133
++#: g10/import.c:2226
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "ключ %s: недействительный сертификат отзыва: %s - отвергнут\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "ключ %s: сертификат отзыва \"%s\" импортирован\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "ключ %s: нет ID пользователя для подписи\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"ключ %s: алгоритм с открытым ключом у ID пользователя \"%s\" не "
"поддерживается\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "ключ %s: неправильная самоподпись на ID пользователя \"%s\"\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "ключ %s: алгоритм с открытым ключом не поддерживается\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "ключ %s: недействительная прямая подпись ключа\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "ключ %s: нет подключа для связывания ключей\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "ключ %s: недопустимая связь подключей\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "ключ %s: удалено многократное связывание подключей\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "ключ %s: нет подключа для отзыва ключа\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "ключ %s: неверный отзыв подключа\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "ключ %s: удален многократный отзыв подключей\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "ключ %s: пропущен ID пользователя \"%s\"\n"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "ключ %s: пропущен подключ\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "ключ %s: неэкспортируемая подпись (класс 0x%02X) - пропущена\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "ключ %s: недействительный сертификат отзыва: %s - пропущен\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "ключ %s: неожиданный класс подписи (0x%02X) - пропущена\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "ключ %s: обнаружено дублирование ID пользователя - объединены\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "Внимание: ключ %s, возможно, отозван: запрашиваю ключ отзыва %s\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "Внимание: ключ %s, возможно, отозван: ключ отзыва %s отсутствует.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "ключ %s: добавлен сертификат отзыва \"%s\"\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "ключ %s: добавлена прямая подпись ключа\n"
@@@ -3948,8 -3055,6 +3920,8 @@@ msgstr "Этот ключ провер�
msgid "Really sign? (y/N) "
msgstr "Действительно подписать? (y/N) "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "подписать не удалось: %s\n"
@@@ -4278,13 -3307,10 +4250,12 @@@ msgstr "сбой при обновле�
msgid "Key not changed so no update needed.\n"
msgstr "Ключ не изменялся - обновление не нужно.\n"
+#: g10/keyedit.c:3025
- #, fuzzy, c-format
- #| msgid "Key generation failed: %s\n"
+ #, c-format
msgid "User ID revocation failed: %s\n"
- msgstr "Сбой при создании ключа: %s\n"
+ msgstr "Сбой при отзыве идентификатора: %s\n"
+#: g10/keyedit.c:3070
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\" - не отпечаток\n"
@@@ -4400,13 -3402,9 +4371,13 @@@ msgstr "
"Учтите, что показанная достоверность ключа может быть неверной,\n"
"пока Вы не перезапустите программу.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
msgid "revoked"
msgstr "отозван"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "просрочен"
@@@ -4678,12 -3620,10 +4649,12 @@@ msgstr "Действительно со
msgid "no secret key\n"
msgstr "нет секретного ключа\n"
+#: g10/keyedit.c:6230
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
- msgstr ""
+ msgstr "попытка отзыва непользовательского идентификатора: %s\n"
+#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ID пользователя \"%s\" уже отозван\n"
@@@ -5331,12 -4151,10 +5302,12 @@@ msgstr " Отпечаток клю
msgid " Card serial no. ="
msgstr " серийный номер карты ="
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, c-format
msgid "caching keyring '%s'\n"
msgstr "занесение таблицы ключей '%s' в буфер\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
@@@ -5344,7 -4162,6 +5315,7 @@@ msgstr[0] "пока в буфер по�
msgstr[1] "пока в буфер помещено %lu ключей (%lu подписи)\n"
msgstr[2] "пока в буфер помещено %lu ключей (%lu подписей)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
@@@ -5352,7 -4169,6 +5323,7 @@@ msgstr[0] "в буфер записа�
msgstr[1] "в буфер записаны %lu ключа"
msgstr[2] "в буфер записано %lu ключей"
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, c-format
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
@@@ -5360,7 -4176,6 +5331,7 @@@ msgstr[0] "(%lu подпись)\n
msgstr[1] "(%lu подписи)\n"
msgstr[2] "(%lu подписей)\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: таблица ключей создана\n"
@@@ -5572,114 -4342,95 +5543,120 @@@ msgstr "отдельный сертиф
msgid "no signature found\n"
msgstr "подпись не найдена\n"
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, c-format
msgid "BAD signature from \"%s\""
msgstr "ПЛОХАЯ подпись пользователя \"%s\""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Просроченная подпись пользователя \"%s\""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, c-format
msgid "Good signature from \"%s\""
msgstr "Действительная подпись пользователя \"%s\""
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "проверка подписи подавлена\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
msgid "can't handle this ambiguous signature data\n"
msgstr "не могу обработать эти неоднозначные данные подписи\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, c-format
msgid "Signature made %s\n"
msgstr "Подпись сделана %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, c-format
msgid " using %s key %s\n"
msgstr " ключом %s с ID %s\n"
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Подпись сделана %s ключом %s с ID %s\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ #| msgid " aka \"%s\""
+ msgid " issuer \"%s\"\n"
+ msgstr " или \"%s\""
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "Ключ доступен на: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[сомнительно]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, c-format
msgid " aka \"%s\""
msgstr " или \"%s\""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "Подпись просрочена %s\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "Подпись действительна до %s\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "формат подписи: %s, хеш-функция %s%s%s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "двоичный"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "текстовый"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "неизвестно"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
msgid ", key algorithm "
msgstr ", алгоритм ключа "
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr "Внимание: не отделенная подпись; файл '%s' НЕ был проверен!\n"
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Не могу проверить подпись: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "не отделенная подпись\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"Внимание: обнаружено несколько подписей. Проверена будет только первая.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "отдельная подпись класса 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "подпись старого типа (PGP 2.x)\n"
@@@ -5858,81 -4574,38 +5835,49 @@@ msgstr "
msgid "subpacket of type %d has critical bit set\n"
msgstr "в подпакете типа %d установлен критический бит\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, c-format
msgid "problem with the agent: %s\n"
msgstr "проблема с агентом: %s\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, c-format
- msgid " (main key ID %s)"
- msgstr " (ID главного ключа %s)"
-
- #: g10/passphrase.c:277
- #, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Введите фразу-пароль для доступа к секретному ключу сертификата OpenPGP:\n"
- "\"%.*s\"\n"
- "%u-битный ключ %s, ID %s,\n"
- "создан %s%s.\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Введите фразу-пароль\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "прервано пользователем\n"
- #: g10/passphrase.c:483
++#: g10/passphrase.c:489
#, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "Необходима фраза-пароль для доступа к секретному ключу пользователя: \"%s\"\n"
-
- #: g10/passphrase.c:491
- #, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%u-битный ключ %s, ID %s, создан %s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr " (подключ на главном ключе %s)"
+ msgid " (main key ID %s)"
+ msgstr " (ID главного ключа %s)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Введите фразу-пароль для разблокировки секретного ключа OpenPGP:"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Введите фразу-пароль для импорта секретного ключа OpenPGP:"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Введите фразу-пароль для экспорта секретного подключа OpenPGP:"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Введите фразу-пароль для экспорта секретного ключа OpenPGP:"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Вы действительно хотите навсегда удалить секретный подключ OpenPGP:"
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Вы действительно хотите навсегда удалить секретный ключ OpenPGP:"
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, c-format
msgid ""
"%s\n"
@@@ -6133,122 -4771,95 +6078,122 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "Все равно использовать данный ключ? (y/N) "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "Внимание: Использование недоверенного ключа!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "Внимание: возможно, данный ключ отозван (ключ отзыва отсутствует)\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "Внимание: Данный ключ отозван ключом, назначенным отзывающим!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "Внимание: Данный ключ отозван его владельцем!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
msgid " This could mean that the signature is forged.\n"
msgstr " Это может означать, что подпись подделана.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "Внимание: Данный подключ был отозван его владельцем!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Замечание: Данный ключ отключен.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Замечание: Проверенный адрес подписавшего - '%s'\n"
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "Замечание: Адрес подписавшего '%s' не соответствует данным DNS\n"
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "уровень доверия установлен в ПОЛНОСТЬЮ по действительным данным PKA\n"
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "уровень доверия установлен в НИКОГДА из-за непригодных данных PKA\n"
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Замечание: Данный ключ просрочен!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "Внимание: Данный ключ не заверен доверенной подписью!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Нет указаний на то, что подпись принадлежит владельцу.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "Внимание: НЕТ ДОВЕРИЯ данному ключу!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " Возможно, что подпись ПОДДЕЛАНА.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"Внимание: Этот ключ не заверен достаточным количеством доверенных подписей!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Нет уверенности в том, что подпись принадлежит владельцу.\n"
- #: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: пропущено: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: пропущено: открытый ключ отключен\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: пропущено: открытый ключ уже существует\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, c-format
msgid "can't encrypt to '%s'\n"
msgstr "не могу зашифровать для '%s'\n"
- #: g10/pkclist.c:984
++#: g10/pkclist.c:988
#, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "задан параметр '%s', но не заданы ключи по умолчанию\n"
- #: g10/pkclist.c:991
++#: g10/pkclist.c:995
#, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "задан параметр '%s', но параметр '%s' не задан\n"
- #: g10/pkclist.c:1094
++#: g10/pkclist.c:1098
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Не задан ID пользователя (можно использовать \"-r\").\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr "Текущие получатели:\n"
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6256,37 -4867,29 +6201,37 @@@ msgstr "
"\n"
"Введите ID пользователя. Завершите пустой строкой: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Нет такого ID пользователя.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
msgid "skipped: public key already set as default recipient\n"
msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
- #: g10/pkclist.c:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "Открытый ключ отключен.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "пропущено: открытый ключ уже установлен\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "неизвестный получатель по умолчанию \"%s\"\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "нет пригодных адресов\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Замечание: у ключа %s нет функции %s\n"
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Замечание: у ключа %s нет предпочтения для %s\n"
@@@ -6567,7 -5118,6 +6512,7 @@@ msgstr[0] "открытый ключ %
msgstr[1] "открытый ключ %s на %lu дня новее подписи\n"
msgstr[2] "открытый ключ %s на %lu дней новее подписи\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6648,12 -5189,10 +6593,12 @@@ msgstr "
"Внимание: невозможно развернуть %% в URL предпочтительного сервера ключей "
"(слишком длинный). Использую неразвернутым.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "подпись %s/%s пользователя \"%s\"\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6661,11 -5200,9 +6606,11 @@@ msgstr "
"Внимание: использование хеш-функции %s (%d) нарушает предпочтения "
"получателя\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "подпись:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "будет использовано шифрование по %s\n"
@@@ -6769,7 -5286,6 +6714,7 @@@ msgstr "слишком большая �
msgid "%s: directory does not exist!\n"
msgstr "%s: каталог не существует!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, c-format
msgid "can't access '%s': %s\n"
msgstr "нет доступа к '%s': %s\n"
@@@ -6878,66 -5372,46 +6823,58 @@@ msgstr "не могу обработа�
msgid "input line longer than %d characters\n"
msgstr "строка ввода длиннее %d символов\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "ошибка в начале операции с базой данных TOFU: %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr "ошибка записи изменения в базе данных TOFU: %s\n"
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr "ошибка отката назад изменения в базе данных TOFU: %s\n"
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr "версия базы данных TOFU (не поддерживается): %s\n"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "ошибка чтения базы данных TOFU: %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, c-format
msgid "error determining TOFU database's version: %s\n"
msgstr "ошибка определения версии базы данных TOFU: %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, c-format
msgid "error initializing TOFU database: %s\n"
msgstr "ошибка инициализации базы данных TOFU: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "ошибка открытия базы данных TOFU '%s': %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr "Внимание: Домашний каталог содержит как tofu.db, так и tofu.d\n"
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr "Используется разделенный формат базы данных TOFU\n"
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "ошибка обновления базы данных TOFU: %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr "Привязка %s неизвестна."
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
@@@ -6946,7 -5420,6 +6883,7 @@@ msgstr "
"Ключ с отпечатком %s противоречит этой привязке %s. Поскольку правило "
"привязки было 'автоматически', оно изменилось на 'спрашивать'."
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
@@@ -6955,26 -5428,21 +6892,26 @@@ msgstr "
"Укажите, считаете ли Вы привязку %s%sправомерной (ключ принадлежит "
"заявленному владельцу) или поддельной (плохой)."
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "ошибка при сборе ID других пользователей: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr "Известные ID пользователя, связанные с этим ключом:\n"
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, c-format
msgid "policy: %s"
msgstr "правило: %s"
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, c-format
msgid "error gathering signature stats: %s\n"
msgstr "ошибка сбора статистики подписей: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -6982,16 -5450,13 +6919,16 @@@ msgstr[0] "Адрес электрон�
msgstr[1] "Адрес электронной почты \"%s\" связан с %d ключами:\n"
msgstr[2] "Адрес электронной почты \"%s\" связан с %d ключами:\n"
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "Статистика ключей с адресом электронной почты \"%s\":\n"
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
msgid "this key"
msgstr "этот ключ"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
@@@ -6999,7 -5464,6 +6936,7 @@@ msgstr[0] "%ld сообщение по�
msgstr[1] "%ld сообщения подписаны в будущем."
msgstr[2] "%ld сообщений подписано в будущем."
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
@@@ -7007,7 -5471,6 +6944,7 @@@ msgstr[0] "%ld сообщение по�
msgstr[1] "%ld сообщения подписаны"
msgstr[2] "%ld сообщений подписано"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
@@@ -7015,7 -5478,6 +6952,7 @@@ msgstr[0] " за %ld прошедши�
msgstr[1] " за %ld прошедших дня."
msgstr[2] " за %ld прошедших дней."
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
@@@ -7023,7 -5485,6 +6960,7 @@@ msgstr[0] " за %ld прошедшу�
msgstr[1] " за %ld прошедших недели."
msgstr[2] " за %ld прошедших недель."
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7034,7 -5495,6 +6971,7 @@@ msgstr[2] " за %ld прошедши�
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
"Обычно с конкретным адресом электронной почты связан только один ключ. "
@@@ -7047,28 -5507,23 +6984,28 @@@
#. 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:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr "gGaAuUrRbB"
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
"(G)Хороший, (A)Пока принять, (U)Неясно, (R)Пока отвергнуть, (B)Плохой? "
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "ошибка установки уровня доверия привязки TOFU в %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "ошибка при смене правила TOFU: %s\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
@@@ -7076,7 -5531,6 +7013,7 @@@ msgstr[0] "%d~год
msgstr[1] "%d~года"
msgstr[2] "%d~лет"
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
@@@ -7084,7 -5538,6 +7021,7 @@@ msgstr[0] "%d~месяц
msgstr[1] "%d~месяца"
msgstr[2] "%d~месяцев"
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
@@@ -7092,7 -5545,6 +7029,7 @@@ msgstr[0] "%d~день
msgstr[1] "%d~дня"
msgstr[2] "%d~дней"
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
@@@ -7100,7 -5552,6 +7037,7 @@@ msgstr[0] "%d~час
msgstr[1] "%d~часа"
msgstr[2] "%d~часов"
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
@@@ -7108,7 -5559,6 +7045,7 @@@ msgstr[0] "%d~минута
msgstr[1] "%d~минуты"
msgstr[2] "%d~минут"
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
@@@ -7116,12 -5566,10 +7053,12 @@@ msgstr[0] "%d~секунда
msgstr[1] "%d~секунды"
msgstr[2] "%d~секунд"
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr "Сообщения, подписанные ключом %s, никогда не проверялись!\n"
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
@@@ -7130,12 -5578,10 +7067,12 @@@ msgstr "
"Не удалось собрать статистику подписей для \"%s\"\n"
"(ключ %s)\n"
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, c-format
msgid "Verified %ld messages signed by \"%s\"."
msgstr "Проверено %ld сообщений, подписанных \"%s\"."
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7153,24 -5599,20 +7090,24 @@@ msgstr[2] "
"Проверено %ld сообщений, подписанных \"%s\"\n"
" за %s."
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr "Последнее сообщение проверено %s назад."
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
"Внимание: мы до сих пор не видели ни одного сообщения, подписанного этим "
"ключом!\n"
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
"Внимание: мы до сих пор видели только одно сообщение, подписанное этим "
"ключом!\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7203,8 -5645,6 +7140,7 @@@ msgstr[2] "
"некачественный командой\n"
" %s\n"
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "ошибка при открытии базы данных TOFU: %s\n"
@@@ -7736,7 -6067,6 +7672,7 @@@ msgstr "|N|Первоначальны�
msgid "run in multi server mode (foreground)"
msgstr "работать в многосерверном режиме (нефоновый режим)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|установить уровень отладки, равный LEVEL"
@@@ -7788,17 -6107,14 +7724,17 @@@ msgstr "
"Синтаксис: scdaemon [параметры] [команда [аргументы]]\n"
"Демон криптографических карт для @GNUPG@\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
"используйте параметр '--daemon' для запуска приложения в фоновом режиме\n"
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr "обработчик fd %d запущен\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "обработчик fd %d остановлен\n"
@@@ -7897,12 -6190,10 +7833,12 @@@ msgstr "проверьте, что \"di
msgid "checking the CRL failed: %s"
msgstr "сбой проверки списка отозванных сертификатов: %s"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr "сертификат с недействительной достоверностью: %s"
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr "сертификат еще не достоверен"
@@@ -7914,7 -6203,6 +7850,7 @@@ msgstr "корневой сертифи
msgid "intermediate certificate not yet valid"
msgstr "промежуточный сертификат еще не достоверен"
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
msgid "certificate has expired"
msgstr "сертификат просрочен"
@@@ -7963,7 -6240,6 +7899,7 @@@ msgstr " (сертификат дей�
msgid " ( issuer valid from "
msgstr " ( издатель действителен с "
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, c-format
msgid "fingerprint=%s\n"
msgstr "отпечаток=%s\n"
@@@ -7994,7 -6264,6 +7930,7 @@@ msgstr "в сертификате не
msgid "self-signed certificate has a BAD signature"
msgstr "у самозаверенного сертификата ПЛОХАЯ подпись"
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr "корневой сертификат не помечен как доверенный"
@@@ -8003,30 -6271,24 +7939,30 @@@
msgid "checking the trust list failed: %s\n"
msgstr "сбой проверки списка доверия: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr "слишком длинная цепочка сертификатов\n"
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr "не найден издатель сертификата"
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
msgid "certificate has a BAD signature"
msgstr "сертификат имеет ПЛОХУЮ подпись"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr ""
"найден еще один возможный сертификат удостоверяющего центра - повторная "
"попытка"
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr "цепочка сертификатов длиннее допускаемой удостоверяющим центром (%d)"
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
msgid "certificate is good\n"
msgstr "хороший сертификат\n"
@@@ -8056,7 -6312,6 +7992,7 @@@ msgstr "%u-битный хеш недо
msgid "(this is the MD2 algorithm)\n"
msgstr "(это алгоритм MD2)\n"
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
msgid "none"
msgstr "нет"
@@@ -8090,36 -6340,28 +8026,36 @@@ msgstr "
"S/N %s, ID 0x%08lX,\n"
"создан %s, истекает %s.\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr "не задана применимость ключа - подразумеваем все\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "ошибка получения информации применимости ключа: %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr "сертификат не следовало использовать для заверения\n"
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr "сертификат не следовало использовать для подписывания ответа OCSP\n"
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr "сертификат не следовало использовать для шифрования\n"
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr "сертификат не следовало использовать для подписей\n"
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr "сертификат не пригоден для шифрования\n"
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr "сертификат не пригоден для подписи\n"
@@@ -8539,21 -6691,17 +8475,21 @@@ msgstr "%s:%u: задан пароль
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: пропускаю эту строку\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
msgid "could not parse keyserver\n"
msgstr "не удалось определить сервер ключей\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "импорт общих сертификатов '%s'\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "невозможно подписать с помощью '%s': %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr "недопустимая команда (неявной команды нет)\n"
@@@ -8614,7 -6750,6 +8550,7 @@@ msgstr "проблема повторн
msgid "error storing flags: %s\n"
msgstr "ошибка сохранения признаков: %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr "Ошибка - "
@@@ -8742,93 -6856,69 +8678,88 @@@ msgstr "не могу снять бло
msgid "dropping %u certificates from the cache\n"
msgstr "опускается %u сертификатов из буфера\n"
- #: dirmngr/certcache.c:352
- #, c-format
- msgid "can't access directory '%s': %s\n"
- msgstr "не могу получить доступ к каталогу '%s': %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, c-format
msgid "can't parse certificate '%s': %s\n"
msgstr "не могу интерпретировать сертификат '%s': %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, c-format
msgid "certificate '%s' already cached\n"
msgstr "сертификат '%s' уже в буфере\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "доверенный сертификат '%s' загружен\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, c-format
msgid "certificate '%s' loaded\n"
msgstr "сертификат '%s' удален\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr " отпечаток SHA1 =% s\n"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr " издатель ="
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr " субъект ="
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "ошибка загрузки сертификата '%s': %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, c-format
msgid "permanently loaded certificates: %u\n"
msgstr " постоянно загруженных сертификатов: %u\n"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, c-format
msgid " runtime cached certificates: %u\n"
msgstr "сертификатов в буфере времени исполнения: %u\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
msgid "certificate already cached\n"
msgstr "сертификат уже в буфере\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
msgid "certificate cached\n"
msgstr "сертификат в буфере\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, c-format
msgid "error caching certificate: %s\n"
msgstr "ошибка помещения сертификата в буфер: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "неверный отпечаток SHA1 '%s'\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "ошибка получения сертификата по серийному номеру: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "ошибка получения сертификата по субъекту: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
msgid "no issuer found in certificate\n"
msgstr "в сертификате не найден издатель\n"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "ошибка получения authorityKeyIdentifier: %s\n"
@@@ -9093,7 -7132,6 +9024,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "ошибка получения данных из файла буфера: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, c-format
msgid "unknown hash algorithm '%s'\n"
msgstr "недопустимая хеш-функция '%s'\n"
@@@ -9112,7 -7147,6 +9043,7 @@@ msgstr "из libksba получено �
msgid "converting S-expression failed: %s\n"
msgstr "сбой преобразования S-выражения: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, c-format
msgid "creating S-expression failed: %s\n"
msgstr "сбой создания S-выражения: %s\n"
@@@ -9511,118 -7465,87 +9442,114 @@@ msgstr "нужно абсолютно�
msgid "looking up '%s'\n"
msgstr "поиск '%s'\n"
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr "запустить как службу окон (фоновый режим)"
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr "вывести содержание буфера списков отозванных сертификатов"
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|загрузить список отозванных сертификатов из файла FILE в буфер"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|получить список отозванных сертификатов из URL"
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr "выключить dirmngr"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr "записать буфер на диск"
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr "|FILE|сохранять журнал режима сервера в файле FILE"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
msgid "run without asking a user"
msgstr "работать, не спрашивая пользователя"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr "принудительная загрузка устаревших списков отозванных сертификатов"
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr "разрешить посылку запросов OCSP"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr "запретить использование HTTP"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr "запретить использование LDAP"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
"игнорировать точки распространения списков отозванных сертификатов по HTTP"
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
"игнорировать точки распространения списков отозванных сертификатов по LDAP"
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr "игнорировать URL служб OCSP из сертификата"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|перенаправлять все запросы HTTP на URL"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HOST|использовать хост HOST для поиска LDAP"
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "не пользоваться запасными хостами с --ldap-proxy"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|взять список серверов LDAP из файла FILE"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
"добавлять новые серверы, обнаруженные в точках распространения списков "
"отозванных сертификатов, в список серверов"
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|установить время ожидания LDAP N секунд"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|использовать ответчик OCSP по URL"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|ответ OCSP подписан сертификатом с отпечатком FPR"
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr "|N|не возвращать более чем N результатов одного поиска"
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
"|FILE|использовать сертификаты удостоверяющего центра из файла FILE для HKP "
"по TLS"
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr "проводить весь сетевой обмен через Tor"
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9631,11 -7554,9 +9558,11 @@@ msgstr "
"@\n"
"(Полный список команд и параметров см. в руководстве \"info\")\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Вызов: @DIRMNGR@ [параметры] (-h для подсказки)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9643,77 -7564,60 +9570,77 @@@ msgstr "
"Синтаксис: @DIRMNGR@ [параметры] [команда [аргументы]]\n"
"Доступ к OCSP, серверам ключей, спискам отозванных сертификатов для @GNUPG@\n"
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "допустимые уровни отладки: %s\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, c-format
msgid "usage: %s [options] "
msgstr "вызов: %s [параметры] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
msgid "colons are not allowed in the socket name\n"
msgstr "двоеточия в имени сокета недопустимы\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "сбой при получении списка отозванных сертификатов из '%s': %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "сбой обработки списка отозванных сертификатов из '%s': %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: слишком длинная строка - пропущена\n"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: обнаружен неверный отпечаток\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: ошибка чтения: %s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: мусор в конце строки игнорируется\n"
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr "получен SIGHUP - повторное чтение настроек и запись буферов на диск\n"
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr "получен SIGUSR2 - действие не определено\n"
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr "получен SIGTERM - завершение работы ...\n"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "получен SIGTERM - осталось %d активных соединений\n"
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
msgid "shutdown forced\n"
msgstr "принудительное выключение\n"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr "получен SIGINT - немедленное завершение работы\n"
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "получен сигнал %d - действие не определено\n"
@@@ -10043,98 -7877,77 +9970,98 @@@ msgstr "сбой получения х�
msgid "not signed by a default OCSP signer's certificate"
msgstr "не подписано основным сертификатом подписывающего OCSP"
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr "для ответов OCSP поддерживается только SHA-1\n"
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, c-format
msgid "allocating list item failed: %s\n"
msgstr "сбой размещения элемента списка: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, c-format
msgid "error getting responder ID: %s\n"
msgstr "ошибка при получении ID ответчика: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr "не найдено подходящего сертификата для проверки ответа OCSP\n"
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, c-format
msgid "issuer certificate not found: %s\n"
msgstr "не найден сертификат издателя: %s\n"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr "вызывавший не вернул целевой сертификат\n"
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
msgid "caller did not return the issuing certificate\n"
msgstr "вызывавший не вернул издающий сертификат\n"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "сбой при выделении памяти под контекст OCSP: %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, c-format
msgid "can't get authorityInfoAccess: %s\n"
msgstr "не могу получить authorityInfoAccess: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr "не определен основной ответчик OCSP\n"
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
msgid "no default OCSP signer defined\n"
msgstr "не определен основной подписывающий в OCSP\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr "используется основной ответчик OCSP '%s'\n"
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, c-format
msgid "using OCSP responder '%s'\n"
msgstr "используется ответчик OCSP '%s'\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr "сбой при установлении контекста хеша для OCSP: %s\n"
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "ошибка получения статуса OCSP для целевого сертификата: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr "статус сертификата: %s (этот=%s, следующий=%s)\n"
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr "хороший"
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "сертификат был отозван %s по причине: %s\n"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr "ответчик OCSP возвратил статус в будущем\n"
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr "ответчик OCSP возвратил нетекущий статус\n"
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr "ответчик OCSP возвратил слишком старый статус\n"
@@@ -10182,32 -7985,26 +10109,32 @@@ msgstr "сбой fetch_next_cert: %s\n
msgid "max_replies %d exceeded\n"
msgstr "превышено max_replies %d\n"
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "сбой при выделении памяти под управляющую структуру: %s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "сбой размещения контекста Assuan: %s\n"
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "сбой инициализации сервера: %s\n"
- #: dirmngr/server.c:2444
++#: dirmngr/server.c:2406
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "сбой регистрации команд с помощью Assuan: %s\n"
- #: dirmngr/server.c:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "проблема с приемом Assuan: %s\n"
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "сбой обработки Assuan: %s\n"
@@@ -10229,34 -8022,24 +10156,30 @@@ msgstr "не проверяю спис�
msgid "checking CRL for"
msgstr "проверка списка отозванных сертификатов для"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr "работа в совместимом режиме - цепочка сертификатов не проверена!\n"
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
msgid "selfsigned certificate has a BAD signature"
msgstr "у самозаверенного сертификата ПЛОХАЯ подпись"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "сбой при проверке доверенности корневого сертификата: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
msgid "certificate chain is good\n"
msgstr "хорошая цепочка сертификатов\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA требует 160-битной хеш-функции\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
"сертификат не следовало использовать для подписывания списка отозванных "
"сертификатов\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
msgid "quiet"
msgstr "менее подробно"
@@@ -10382,11 -8134,9 +10305,11 @@@ msgstr "|N|установить мак�
msgid "Options enforcing a passphrase policy"
msgstr "Параметры, обеспечивающие правила для фраз-паролей"
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr "не позволять обходить правила для фраз-паролей"
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|установить минимальную длину фразы-пароля равной N"
@@@ -10521,67 -8239,51 +10444,67 @@@ msgstr "Внешняя проверк�
msgid "Note that group specifications are ignored\n"
msgstr "Обратите внимание, что спецификации групп игнорируются\n"
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr "вывод списка всех компонентов"
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr "проверить все программы"
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr "|COMPONENT|вывод списка параметров"
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr "|COMPONENT|изменить параметры"
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr "|COMPONENT|проверить параметры"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr "применить глобальные значения по умолчанию"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr "получить каталоги настроек для @GPGCONF@"
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
msgid "list global configuration file"
msgstr "указать глобальный файл настроек"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
msgid "check global configuration file"
msgstr "проверить глобальный файл настроек"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr "перезагрузить все или заданный компонент"
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr "запустить заданный компонент"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr "выключить заданный компонент"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "вывод в указанный файл"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr "задействовать изменения во время исполнения, если возможно"
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Вызов: @GPGCONF@ [параметры] (-h для подсказки)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10589,15 -8291,12 +10512,15 @@@ msgstr "
"Синтаксис: @GPGCONF@ [параметры]\n"
"Управляет параметрами настроек инструментария @GNUPG@\n"
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr "Требуется однокомпонентный аргумент"
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
msgid "Component not found"
msgstr "Компонент не найден"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
msgid "No argument allowed"
msgstr "Аргументы не разрешены"
@@@ -10649,122 -8339,97 +10572,122 @@@ msgstr "
"ФАЙЛ_КЛЮЧА [параметры...] КОМАНДА [входной файл]\n"
"Вызывает простое средство шифрования\n"
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s над %s прервано, статус %i\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, c-format
msgid "%s on %s failed with status %i\n"
msgstr "сбой %s над %s, статус %i\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "не могу создать временный каталог '%s': %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr "невозможно открыть %s на запись: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, c-format
msgid "error writing to %s: %s\n"
msgstr "ошибка записи в %s: %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, c-format
msgid "error reading from %s: %s\n"
msgstr "ошибка чтения из %s: %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, c-format
msgid "error closing %s: %s\n"
msgstr "ошибка закрытия %s: %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
msgid "no --program option provided\n"
msgstr "не задан параметр --program\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr "поддерживаются только параметры --decrypt и --encrypt\n"
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr "не задан параметр --keyfile\n"
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr "невозможно выделить память под вектор аргументов\n"
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, c-format
msgid "could not create pipe: %s\n"
msgstr "сбой при создании канала конвейера: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, c-format
msgid "could not create pty: %s\n"
msgstr "сбой при создании псевдотерминала: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr "сбой при дублировании процесса: %s\n"
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, c-format
msgid "execv failed: %s\n"
msgstr "сбой execv: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, c-format
msgid "select failed: %s\n"
msgstr "сбой select: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, c-format
msgid "read failed: %s\n"
msgstr "сбой чтения: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, c-format
msgid "pty read failed: %s\n"
msgstr "сбой чтения из псевдотерминала: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, c-format
msgid "waitpid failed: %s\n"
msgstr "сбой waitpid: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr "потомок завершился, статус %i\n"
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "сбой при выделении памяти под имя входного файла: %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "сбой при выделении памяти под имя выходного файла: %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr "следует задать %s либо %s\n"
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr "не задан класс\n"
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, c-format
msgid "class %s is not supported\n"
msgstr "класс %s не поддерживается\n"
diff --cc po/sk.po
index 6f9548e,7f9464d..0d4925f
--- a/po/sk.po
+++ b/po/sk.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2004-07-20 15:52+0200\n"
"Last-Translator: Michal Majer <mmajer at econ.umb.sk>\n"
"Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@@ -101,14 -85,10 +101,14 @@@ msgstr "Pros�m, vlo�te heslo; toto je t
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
#, fuzzy
msgid "Passphrase:"
msgstr "nespr�vne heslo"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr ""
@@@ -153,98 -125,70 +153,98 @@@ msgstr "nespr�vne MPI
msgid "Bad Passphrase"
msgstr "nespr�vne heslo"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, 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:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
msgstr "nem�em otvori� `%s': %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, fuzzy, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "nen�jden� zapisovate�n� s�bor tajn�ch k���ov (secring): %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, fuzzy, c-format
msgid "shadowing the key failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, fuzzy, c-format
msgid "error writing key: %s\n"
msgstr "chyba pri z�pise s�boru k���ov (keyring) `%s': %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "zmeni� heslo"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
"%s%%0Awithin gpg-agent's key storage"
msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
@@@ -385,8 -303,6 +385,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "zmeni� heslo"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -396,118 -312,87 +396,118 @@@ msgstr "
"Mo�nosti:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "s dodato�n�mi inform�ciami"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "by� o trochu tich��"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "vyh�ada� k���e na serveri k���ov"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "aktualizova� datab�zu d�very"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, 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:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
#, fuzzy
msgid "allow presetting passphrase"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "nepodporovan�"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -516,136 -401,94 +516,128 @@@ 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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Chyby ozn�mte, pros�m, na adresu <gnupg-bugs at gnu.org>.\n"
"Pripomienky k prekladu <sk-i18n at lists.linux.sk>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr ""
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "s�bor s mo�nos�ami `%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, 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:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s: nem�em vytvori�: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
#, 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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, 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:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, 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:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: adres�r vytvoren�\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, 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:1958
++#: agent/gpg-agent.c:1957
#, 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:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
@@@ -660,28 -501,22 +652,28 @@@ msgstr "
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2390
++#: agent/gpg-agent.c:2392
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, 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:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: presko�en�: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
@@@ -697,8 -530,6 +689,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -706,9 -537,6 +698,9 @@@ msgstr "
"@Pr�kazy:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -729,40 -555,33 +721,40 @@@ msgid "
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
#, fuzzy
msgid "cancelled\n"
msgstr "Zru�i�"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, fuzzy, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
@@@ -932,42 -722,30 +924,42 @@@ msgstr "ochrann� algoritmus %d%s nie j
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "chyba pri ��tan� `%s': %s\n"
@@@ -982,37 -758,15 +974,18 @@@ msgstr "chyba pri z�pise do s�boru tajn
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "nem�em sa pripoji� k `%s': %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "probl�m v komunik�cii s gpg-agentom\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
#, fuzzy
msgid "problem setting the gpg-agent options\n"
msgstr "probl�m s agentom: agent vracia 0x%lx\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- #, fuzzy
- msgid "canceled by user\n"
- msgstr "zru�en� u��vate�om\n"
-
- #: common/simple-pwquery.c:579
- #, fuzzy
- msgid "problem with the agent\n"
- msgstr "probl�m s agentom: agent vracia 0x%lx\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "probl�m s agentom: agent vracia 0x%lx\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "nem�em vypn�� vytv�ranie core s�borov: %s\n"
@@@ -1098,7 -835,6 +1071,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1122,17 -854,14 +1095,17 @@@ msgstr "
msgid "connection to agent is in restricted mode\n"
msgstr "nemo�no previes� v d�vkovom m�de\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr ""
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1426,7 -1095,6 +1399,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
#, fuzzy
msgid "out of core\n"
msgstr "nespracovan�"
@@@ -1485,7 -1142,10 +1458,13 @@@ msgstr "verejn� k��� %08lX nebol n�jden
msgid "waiting for lock %s...\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr ""
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "ASCII k�dovanie: %s\n"
@@@ -1736,10 -1341,6 +1715,10 @@@ msgstr "�iadny zodpovedaj�ci verejn� k�
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
@@@ -2038,27 -1574,18 +2017,27 @@@ msgstr "zapisujem tajn� k��� do `%s'\n
msgid "Invalid command (try \"help\")\n"
msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output pre tento pr�kaz nefunguje\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "nemo�no otvori� `%s'\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, 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:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "chyba pri ��tan� bloku k���a: %s\n"
@@@ -2120,45 -1635,37 +2099,45 @@@ msgstr "existuje tajn� k��� pre tento v
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "aby ste ho zmazali, pou�ite najprv prep�na� \"--delete-secret-key\".\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "v m�de S2K nemo�no pou�i� symetrick� ESK paket\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "pou�it� �ifra %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' je u� skomprimovan�\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "VAROVANIE: s�bor `%s' je pr�zdny\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "��tam z `%s'\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2166,17 -1673,14 +2145,17 @@@
msgstr ""
"vy�iadan� kompresn� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s za�ifrovan� pre: %s\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr ""
@@@ -2291,8 -1774,6 +2270,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: presko�en�: %s\n"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2329,8 -1803,6 +2308,8 @@@ msgstr "chyba pri vytv�ran� `%s': %s\n
msgid "[User ID not found]"
msgstr "[User id not found]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "neplatn� parameter pre import\n"
@@@ -2401,222 -1860,173 +2380,222 @@@ msgstr "
msgid "using subkey %s instead of primary key %s\n"
msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "vytvori� podpis oddelen� od dokumentu"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
#, fuzzy
msgid "make a clear text signature"
msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "vytvori� podpis oddelen� od dokumentu"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "�ifrova� d�ta"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "�ifrovanie len so symetrickou �ifrou"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "de�ifrova� d�ta (implicitne)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verifikova� podpis"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "vyp�sa� zoznam k���ov"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "vyp�sa� zoznam k���ov a podpisov"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
#, fuzzy
msgid "list and check key signatures"
msgstr "skontrolova� podpisy k���ov"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "vyp�sa� zoznam k���ov a fingerprintov"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "vyp�sa� zoznam tajn�ch k���ov"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "vytvori� nov� p�r k���ov"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "vytvori� nov� p�r k���ov"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "vytvori� nov� p�r k���ov"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "vytvori� nov� p�r k���ov"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "vytvori� revoka�n� certifik�t"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "podp�sa� k���"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "podp�sa� k��� lok�lne"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "podp�sa� k���"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "podp�sa� k��� lok�lne"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "podp�sa� alebo modifikova� k���"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "zmeni� heslo"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "exportova� k���e"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "exportova� k���e na server k���ov"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "importova� k���e zo servera k���ov"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "vyh�ada� k���e na serveri k���ov"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "aktualizova� v�etky k���e zo servera k���ov"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "importova�/zl��i� k���e"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "aktualizova� datab�zu d�very"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
#, fuzzy
msgid "print message digests"
msgstr "|algo [s�bory]|vyp� hash"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|MENO|�ifrova� pre MENO"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"pou�i� toto id u��vate�a na podp�sanie\n"
" alebo de�ifrovanie"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr ""
"|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
" komprim�cia)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "pou�i� k�nonick� textov� m�d"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "nevykona� �iadne zmeny"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "vy�iada� potvrdenie pred prep�san�m"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2625,7 -2035,6 +2604,7 @@@ msgstr "
"(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
"mo�nost�)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2645,13 -2054,11 +2624,13 @@@ msgstr "
" --list-keys [men�] vyp�sa� k���e\n"
" --fingerprint [men�] vyp�sa� fingerprinty\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2666,7 -2073,6 +2645,7 @@@ msgstr "
"podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
"implicitn� oper�cie z�visia od vstupn�ch d�t\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2674,612 -2080,478 +2653,607 @@@ msgstr "
"\n"
"Podporovan� algoritmy:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "Verejn� k���e: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "�ifry: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Kompresia: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "pou�itie: gpg [mo�nosti] "
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "konfliktn� pr�kazy\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr ""
"VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
#, fuzzy
msgid "show key usage information during key listings"
msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
#, fuzzy
msgid "show all notations during signature listings"
msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "nastavi� k��� ako neplatn� (disable)"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "nezn�my implicitn� adres�t `%s'\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "nezn�my implicitn� adres�t `%s'\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, fuzzy, c-format
#| msgid "NOTE: old default options file `%s' ignored\n"
msgid "Note: old default options file '%s' ignored\n"
msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr ""
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "Neplatn� e-mailov� adresa\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatn� parameter pre import\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "neplatn� parameter pre import\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "neplatn� parameter pre import\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatn� parameter pre import\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
#, fuzzy
msgid "invalid list options\n"
msgstr "neplatn� parameter pre import\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
#, fuzzy
msgid "invalid verify options\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nemo�no nastavi� exec-path na %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVANIE: program m�e vytvori� s�bor core!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROVANIE: %s prep�e %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie je dovolen� pou��va� %s s %s!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ned�va s %s zmysel!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "polo�ka max-cert-depth mus� by� v rozmedz� od 1 do 255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "neplatn� implicitn� �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "neplatn� minim�lna �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "neplatn� defaultn� predvo�by\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s e�te nepracuje s %s\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, fuzzy, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "nem�ete pou�i� �ifrovac� algoritmus \"%s\" v m�de %s\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, fuzzy, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "nem�ete pou�i� hashovac� algoritmus \"%s\" v m�de %s\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, fuzzy, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "nem�ete pou�i� kompresn� algoritmus \"%s\" v m�de %s\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nem�em inicializova� datab�zu d�very: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"VAROVANIE: dan� adres�t (-r) bez pou�itia �ifrovania s verejn�m k���om\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [meno s�boru]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [meno s�boru]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "de�ifrovanie zlyhalo: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [meno s�boru]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
"pou�itie %s nie je v m�de %s dovolen�\n"
"\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [meno s�boru]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
"pou�itie %s nie je v m�de %s dovolen�\n"
"\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [meno s�boru]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [meno s�boru]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [meno s�boru]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key id u��vate�a"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key id u��vate�a"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id u��vate�a [pr�kazy]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id u��vate�a"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "nepodarilo posla� k��� na server: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "nepodaril sa export k���a: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "nepodaril sa export k���a: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "nepodarilo sa n�js� server: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aktualiz�cia servera zlyhala: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[meno s�boru]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Za�nite p�sa� svoju spr�vu ...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@@ -3324,330 -2588,264 +3298,330 @@@ msgstr "Pomoc nie je k dispoz�cii
msgid "No help available for '%s'"
msgstr "Pomoc nie je dostupn� pre '%s'"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "aktualizova� datab�zu d�very"
- #: g10/import.c:143
++#: g10/import.c:147
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "aktualizova� datab�zu d�very"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
msgid "show key during import"
msgstr "vyp�sa� fingerprint"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:152
++#: g10/import.c:156
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "nepou�ite�n� tajn� k���"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "blok typu %d bol presko�en�\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu k���e boli doteraz spracovan�\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Celkovo spracovan�ch k���ov: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " presko�en� nov� k���e: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " presko�en� nov� k���e: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " bez identifik�torov: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importovan�: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " bez zmien: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nov� id u��vate�ov: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nov� podk���e: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " nov� podpisy: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nov� revok�cie k���ov: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " pre��tan� tajn� k���e: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importovan� tajn� k���e: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " tajn� k���e nezmenen�: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " neimportovan�: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " nov� podpisy: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " pre��tan� tajn� k���e: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:1042
++#: g10/import.c:1048
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s podpis, hashovac� algoritmus %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "presko�en� `%s': %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1264
++#: g10/import.c:1343
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "k��� %08lX: HKP po�kodenie podk���a opraven�\n"
# c-format
- #: g10/import.c:1282
++#: g10/import.c:1361
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr ""
"k��� %08lX: prijat� id u��vate�a '%s', ktor� nie je podp�san� n�m sam�m\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "k��� %08lX: ch�ba platn� identifik�tor u��vate�a\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "m�e to by� sp�soben� ch�baj�cim podpisom k���a n�m sam�m\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "k��� %08lX: nov� k��� - presko�en�\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "chyba pri z�pise s�boru k���ov (keyring) `%s': %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "k��� %08lX: nem�em n�js� origin�lny blok k���a: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "k��� %08lX: nem�em ��ta� origin�lny blok k���a: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "k��� %08lX: \"%s\" 1 nov� identifik�tor u��vate�a\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "k��� %08lX: \"%s\" bez zmeny\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "k��� %08lX: tajn� k��� importovan�\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a %d - presko�en�\n"
@@@ -3662,144 -2860,117 +3636,144 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"k��� %08lX: ch�ba verejn� k��� - nem�em aplikova� revoka�n� certifik�t\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - zamietnut�\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "k��� %08lX: neexistuje id u��vate�a pre podpis\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"k��� %08lX: nepodporovan� algoritmus verejn�ho k���a u u��vate�sk�ho id \"%s"
"\"\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr ""
"k��� %08lX: neplatn� podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "k��� %08lX: podpis k���a n�m sam�m (direct key signature)\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "k��� %08lX: neexistuje podk��� pre viazanie k���ov\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "k��� %08lX: zmazan� viacn�sobn� v�zba podk���a\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "k��� %08lX: neexistuje podk��� na revok�ciu k���a\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "k��� %08lX: zmazan� viacn�sobn� revok�cia podk���a\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "k��� %08lX: podk��� presko�en�\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "k��� %08lX: podpis nie je exportovate�n� (trieda %02x) - presko�en�\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "k��� %08lX: revoka�n� certifik�t na zlom mieste - presko�en� \n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - presko�en�\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "k��� %08lX: neo�ak�van� podpisov� trieda (0x%02X) - presko�en�\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "k��� %08lX: zisten� duplikovan� identifik�tor u��vate�a - zl��en�\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"VAROVANIE: k��� %08lX m�e by� revokovan�: sk��am z�ska� revoka�n� k��� "
"%08lX\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"VAROVANIE: k��� %08lX m�e by� revokovan�: revoka�n� k��� %08lX nen�jden�.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "k��� %08lX: podpis k���a n�m sam�m (direct key signature)\n"
@@@ -4160,8 -3269,6 +4134,8 @@@ msgstr "
msgid "Really sign? (y/N) "
msgstr "Skuto�ne podp�sa�? "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
@@@ -4645,14 -3650,10 +4619,14 @@@ msgstr "
"Pros�m nezab�dajte, �e zobrazovan� �daje o platnosti k���ov nemusia\n"
"by� spr�vne, pokia� znovu nespust�te program.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
#, fuzzy
msgid "revoked"
msgstr "[revokovan�]"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5606,26 -4429,22 +5580,26 @@@ msgstr " Fingerprint k���a =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "kontrolujem s�bor k���ov (keyring) `%s'\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
msgstr[1] "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5633,7 -4452,6 +5607,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 zl� podpis\n"
msgstr[1] "1 zl� podpis\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: s�bor k���ov (keyring) vytvoren�\n"
@@@ -5859,118 -4632,98 +5833,123 @@@ msgstr "
msgid "no signature found\n"
msgstr "Dobr� podpis od \""
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "ZL� podpis od \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Podpis s vypr�anou platnos�ou od \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Dobr� podpis od \""
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "verifik�cia podpisu potla�en�\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Platnos� podpisu vypr�ala %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Podpis vytvoren� %.*s pomocou %s k���a ID %08lX\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ msgid " issuer \"%s\"\n"
+ msgstr " alias \""
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "K��� k dispoz�cii na: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[neist�] "
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "Platnos� podpisu vypr�ala %s\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "Platnos� podpisu vypr�� %s\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s podpis, hashovac� algoritmus %s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "bin�rne"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "textov� m�d"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "nezn�me"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "nezn�my algoritmus verejn�ho k���a"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nem�em overi� podpis: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "toto nie je podpis oddelen� od dokumentu\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "VAROVANIE: N�jden� viacn�sobne podpisy. Skontrolovan� bude len prv�.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "samostatn� podpis triedy 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis star�ho typu (PGP 2.x)\n"
@@@ -6153,88 -4871,44 +6132,55 @@@ msgstr "
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "probl�m s agentom: agent vracia 0x%lx\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, fuzzy, c-format
- msgid " (main key ID %s)"
- msgstr " (hlavn� ID k���a %08lX)"
-
- #: g10/passphrase.c:277
- #, fuzzy, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Potrebujete heslo, aby ste odomkli tajn� k��� pre u��vate�a:\n"
- "\"%.*s\"\n"
- "k��� s d�kou %u bitov, typ %s, ID %08lX, vytvoren� %s%s\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Vlo�i� heslo\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "zru�en� u��vate�om\n"
- #: g10/passphrase.c:483
++#: g10/passphrase.c:489
#, fuzzy, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "\n"
- "Mus�te pozna� heslo, aby ste odomkli tajn� k��� pre\n"
- "u��vate�a: \""
-
- #: g10/passphrase.c:491
- #, fuzzy, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "d�ka %u bitov, typ %s, ID %08lX, vytvoren� %s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr ""
+ msgid " (main key ID %s)"
+ msgstr " (hlavn� ID k���a %08lX)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6439,127 -5078,100 +6385,127 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "Pou�i� napriek tomu tento k���? "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "VAROVANIE: Je pou�it� ned�veryhodn� k���!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "VAROVANIE: k��� m�e by� revokovan� (revoka�n� k��� neexistuje)\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "VAROVANIE: Tento k��� bol revokovan� jeho vlastn�kom!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " To m�e znamena�, �e podpis je falo�n�.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "VAROVANIE: Tento podk��� bol revokovan� jeho vlastn�kom!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Pozn�mka: Tento k��� bol ozna�en� ako neplatn� (disabled).\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Pozn�mka: Skon�ila platnos� tohto k���a!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "VAROVANIE: Tento k��� nie certifikovan� d�veryhodn�m podpisom!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "VAROVANIE: NEd�verujeme tomuto k���u!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " Tento podpis je pravdepodobne FALO�N�.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"VAROVANIE: Tento k��� nie je certifikovan� dostato�ne d�veryhodn�mi "
"podpismi!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
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:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: presko�en�: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: presko�en�: verejn� k��� je neplatn� (disabled)\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, 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:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
- #: g10/pkclist.c:991
++#: g10/pkclist.c:995
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
- #: g10/pkclist.c:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6567,37 -5179,29 +6513,37 @@@ msgstr "
"\n"
"Nap�te identifik�tor u��vate�a (user ID). Ukon�ite pr�zdnym riadkom: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Tak�to identifik�tor u��vate�a neexistuje.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
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:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "Verejn� k��� je neplatn� (disabled).\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "presko�en�: verejn� k��� je u� nastaven�\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "nezn�my implicitn� adres�t `%s'\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "�iadne platn� adresy\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, 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:1649
++#: g10/pkclist.c:1653
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
@@@ -6877,7 -5429,6 +6823,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
msgstr[1] "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6953,23 -5495,19 +6899,23 @@@ msgstr "
"VAROVANIE: nem�em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
"neexpandovan�.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s podpis od: \"%s\"\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "podpisujem:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "bude pou�it� �ifrovanie %s\n"
@@@ -7080,7 -5598,6 +7026,7 @@@ msgstr "transakcia s datab�zou d�very j
msgid "%s: directory does not exist!\n"
msgstr "%s: adres�r neexistuje!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "nem�em zavrie� `%s': %s\n"
@@@ -7192,150 -5687,117 +7138,142 @@@ msgstr "nem�em pracova� s riadkami dlh
msgid "input line longer than %d characters\n"
msgstr "vstupn� riadok je dlh�� ako %d znakov\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Podporovan� algoritmy:\n"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: chyba pri z�pise adres�rov�ho z�znamu: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Politika: "
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "vyp�sa� zoznam k���ov"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [s�bory]|vyp� hash"
msgstr[1] "|algo [s�bory]|vyp� hash"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7345,93 -5807,78 +7283,93 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
msgid "Verified %ld messages signed by \"%s\"."
msgstr "|algo [s�bory]|vyp� hash"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7442,20 -5889,16 +7380,20 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7472,8 -5915,6 +7410,7 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
@@@ -8013,7 -6345,6 +7950,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8069,16 -6389,13 +8006,16 @@@ msgid "
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8183,12 -6477,10 +8120,12 @@@ msgstr "
msgid "checking the CRL failed: %s"
msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr ""
@@@ -8201,7 -6491,6 +8138,7 @@@ msgstr "zapisujem tajn� k��� do `%s'\n
msgid "intermediate certificate not yet valid"
msgstr ""
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
#, fuzzy
msgid "certificate has expired"
msgstr "Platnos� k���a vypr�ala!"
@@@ -8257,7 -6535,6 +8194,7 @@@ msgstr "nespr�vny certifik�t
msgid " ( issuer valid from "
msgstr ""
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "vyp�sa� fingerprint"
@@@ -8287,7 -6558,6 +8224,7 @@@ msgstr "vytvori� revoka�n� certifik�t
msgid "self-signed certificate has a BAD signature"
msgstr ""
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr ""
@@@ -8296,29 -6565,23 +8233,29 @@@
msgid "checking the trust list failed: %s\n"
msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr ""
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr ""
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "verifikova� podpis"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr ""
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
#, fuzzy
msgid "certificate is good\n"
msgstr "duplicita predvo�by %c%lu\n"
@@@ -8351,7 -6608,6 +8288,7 @@@ msgstr "
msgid "(this is the MD2 algorithm)\n"
msgstr ""
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
#, fuzzy
msgid "none"
msgstr "nie"
@@@ -8387,36 -6638,28 +8324,36 @@@ msgstr "
"\"%.*s\"\n"
"k��� s d�kou %u bitov, typ %s, ID %08lX, vytvoren� %s%s\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr ""
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr ""
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr ""
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr ""
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr ""
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr ""
@@@ -8860,22 -7013,18 +8797,22 @@@ msgstr "
msgid "%s:%u: skipping this line\n"
msgstr " s = presko�i� tento k���\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "zapisujem do '%s'\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "nem�em zavrie� `%s': %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8938,7 -7075,6 +8875,7 @@@ msgstr "rev? probl�m overenia revok�cie
msgid "error storing flags: %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr ""
@@@ -9057,98 -7172,73 +8994,92 @@@ msgstr "
msgid "dropping %u certificates from the cache\n"
msgstr ""
- #: dirmngr/certcache.c:352
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
- msgid "can't access directory '%s': %s\n"
- msgstr "nem�em vytvori� adres�r `%s': %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't parse certificate '%s': %s\n"
msgstr "nem�em vytvori� `%s': %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, fuzzy, c-format
msgid "certificate '%s' already cached\n"
msgstr "duplicita predvo�by %c%lu\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, fuzzy, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, fuzzy, c-format
msgid "certificate '%s' loaded\n"
msgstr "duplicita predvo�by %c%lu\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, fuzzy, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr "vyp�sa� fingerprint"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, fuzzy, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, fuzzy, c-format
msgid "permanently loaded certificates: %u\n"
msgstr "nespr�vny certifik�t"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, fuzzy, c-format
msgid " runtime cached certificates: %u\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
#, fuzzy
msgid "certificate already cached\n"
msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
#, fuzzy
msgid "certificate cached\n"
msgstr "duplicita predvo�by %c%lu\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, fuzzy, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "chyba: neplatn� odtla�ok\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, fuzzy, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, fuzzy, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
#, fuzzy
msgid "no issuer found in certificate\n"
msgstr "vytvori� revoka�n� certifik�t"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, fuzzy, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
@@@ -9409,7 -7448,6 +9340,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
@@@ -9431,7 -7466,6 +9362,7 @@@ msgstr "neplatn� reakcia od agenta\n
msgid "converting S-expression failed: %s\n"
msgstr "nemo�no otvori� s�bor: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
@@@ -9827,116 -7781,85 +9758,112 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr ""
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
#, fuzzy
msgid "run without asking a user"
msgstr "Ukon�i� bez ulo�enia? "
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
#, 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:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9950,91 -7873,72 +9877,91 @@@ msgstr "
"(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
"mo�nost�)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "pou�itie: gpg [mo�nosti] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
#, 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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "riadok je pr�li� dlh�\n"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "chyba: neplatn� odtla�ok\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "chyba pri ��tan�: %s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
#, fuzzy
msgid "shutdown forced\n"
msgstr "nespracovan�"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10378,103 -8212,82 +10305,103 @@@ msgstr "kontrola vytvoren�ho podpisu s
msgid "not signed by a default OCSP signer's certificate"
msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, fuzzy, c-format
msgid "allocating list item failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, fuzzy, c-format
msgid "error getting responder ID: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr ""
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, fuzzy, c-format
msgid "issuer certificate not found: %s\n"
msgstr "k��� `%s' nebol n�jden�: %s\n"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr ""
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
#, fuzzy
msgid "caller did not return the issuing certificate\n"
msgstr "vytvori� revoka�n� certifik�t"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, fuzzy, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "nem�em inicializova� datab�zu d�very: %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, fuzzy, c-format
#| msgid "%s: can't access: %s\n"
msgid "can't get authorityInfoAccess: %s\n"
msgstr "%s: nem�em pristupova� k: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
#, fuzzy
#| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
msgstr "nie je nastaven� implicitn� s�bor tajn�ch k���ov %s\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr ""
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, fuzzy, c-format
#| msgid "using cipher %s\n"
msgid "using OCSP responder '%s'\n"
msgstr "pou�it� �ifra %s\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, fuzzy, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, fuzzy, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "POZN�MKA: k��� bol revokovan�"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr ""
@@@ -10522,33 -8325,27 +10449,33 @@@ msgstr "zmazanie bloku k���a sa nepodar
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "nem�em vytvori� `%s': %s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, 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:2444
++#: dirmngr/server.c:2406
#, 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:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10573,34 -8366,24 +10500,30 @@@ msgstr "
msgid "checking CRL for"
msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
#, fuzzy
msgid "selfsigned certificate has a BAD signature"
msgstr "verifikova� podpis"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, fuzzy, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
#, fuzzy
msgid "certificate chain is good\n"
msgstr "duplicita predvo�by %c%lu\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA po�aduje pou�itie 160 bitov�ho hashovacieho algoritmu\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "ukon�i�"
@@@ -10728,11 -8480,9 +10651,11 @@@ msgstr "
msgid "Options enforcing a passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
@@@ -10872,85 -8590,66 +10795,85 @@@ msgstr "
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
#, fuzzy
msgid "list global configuration file"
msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
#, fuzzy
msgid "check global configuration file"
msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "pou�i� ako v�stupn� s�bor"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
#, fuzzy
msgid "Component not found"
msgstr "verejn� k��� nen�jden�"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
#, fuzzy
msgid "No argument allowed"
msgstr "zapisujem tajn� k��� do `%s'\n"
@@@ -11004,123 -8694,98 +10927,123 @@@ msgid "
"Call a simple symmetric encryption tool\n"
msgstr ""
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "Nie je dovolen� pou��va� %s s %s!\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "nemo�no otvori� s�bor: %s\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, fuzzy, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "nem�em vytvori� adres�r `%s': %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "nemo�no otvori� %s: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "chyba pri z�pise s�boru k���ov (keyring) `%s': %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
#, fuzzy
msgid "no --program option provided\n"
msgstr "�iadne vzialen� vykon�vanie programu nie je podporovan�\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr ""
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr ""
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "%s: nem�em vytvori�: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "%s: nem�em vytvori�: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr ""
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "nem�em vytvori� `%s': %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "nem�em vytvori� `%s': %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr ""
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
diff --cc po/sv.po
index 7eba85b,27a591d..d62c741
--- a/po/sv.po
+++ b/po/sv.po
@@@ -24,7 -24,6 +24,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg trunk\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2011-01-12 14:53+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@@ -131,13 -115,9 +131,13 @@@ msgstr "
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
msgid "Passphrase:"
msgstr "Lösenfras:"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr "stämmer inte överens - försök igen"
@@@ -180,91 -152,64 +180,91 @@@ msgstr "Felaktig lösenfras
# Skyddssammandraget låter underligt
# Kontrollsumma?
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh-nycklar större än %d bitar stöds inte\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, 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:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
msgstr "kan inte öppna \"%s\": %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "fel när serienumret hämtades från kortet: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "identifierade kort med serienummer: %s\n"
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, fuzzy, c-format
#| msgid "error getting default authentication keyID of card: %s\n"
msgid "no authentication key for ssh on card: %s\n"
msgstr "fel när nyckel-id för autentisering hämtades från kortet: %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "ingen lämplig kortnyckel hittades: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, c-format
msgid "shadowing the key failed: %s\n"
msgstr "skuggning av nyckeln misslyckades: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, c-format
msgid "error writing key: %s\n"
msgstr "fel vid skrivning av nyckel: %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Ange lösenfrasen för ssh-nyckeln%0A %c"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Ange denna lösenfras igen"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -273,7 -218,6 +273,7 @@@ msgstr "
"Ange en lösenfras för att skydda den mottagna hemliga nyckeln%%0A %s%%0Ai "
"gpg-agents nyckellager"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "misslyckades med att skapa flöde från uttag: %s\n"
@@@ -433,8 -351,6 +433,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:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -442,141 -358,103 +442,141 @@@ msgstr "
"@Flaggor:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr "kör i demonläge (bakgrund)"
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr "kör i serverläge (förgrund)"
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "utförlig"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "var något tystare"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr "sh-liknande kommandoutdata"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr "csh-liknande kommandoutdata"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FIL|läs inställningar från FIL"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr "frigör inte från konsollen"
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr "fånga inte tangentbord och mus"
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "använd en loggfil för servern"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PRG|använd PRG som SCdaemon-programmet"
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
msgid "do not use the SCdaemon"
msgstr "använd inte SCdaemon"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, 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:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr "ignorera begäran om att ändra TTY"
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr "ignorera begäran om att ändra X-display"
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|låt mellanlagrade PIN-koder gå ut efter N sekunder"
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr "använd inte mellanlagring av PIN-kod vid signering"
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, 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:220
++#: agent/gpg-agent.c:219
#, 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:223
++#: agent/gpg-agent.c:222
msgid "allow presetting passphrase"
msgstr "tillåt förinställning av lösenfras"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
#, fuzzy
#| msgid "enable ssh-agent emulation"
msgid "enable ssh support"
msgstr "aktivera ssh-agent-emulering"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Rapportera fel till <@EMAIL@>.\n"
"Skicka synpunkter på översättningen till <tp-sv at listor.tp-sv.se>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
#, 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:484
++#: agent/gpg-agent.c:483
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -588,122 -466,87 +588,114 @@@ msgstr "
"Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
"Hantering av hemliga nycklar för GnuPG\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, 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:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr "%s är för gammal (behöver %s, har %s)\n"
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "inställningsfil \"%s\": %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, 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:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, c-format
msgid "can't create socket: %s\n"
msgstr "kan inte skapa uttag: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, 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:1844
++#: agent/gpg-agent.c:1843
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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
msgid "error getting nonce for the socket\n"
msgstr "fel vid hämtning av nonce för uttaget\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, 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:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, 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:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() misslyckades: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, 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:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, 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:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
msgstr "katalogen \"%s\" skapades\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, 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:1958
++#: agent/gpg-agent.c:1957
#, 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:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fel vid läsning av nonce på fd %d: %s\n"
@@@ -718,29 -559,23 +710,29 @@@ msgstr "hanteraren 0x%lx för fd %d sta
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "hanteraren 0x%lx för fd %d avslutad\n"
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, 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:2390
++#: agent/gpg-agent.c:2392
#, 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:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, 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:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppad\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "ingen gpg-agent kör i den här sessionen\n"
@@@ -758,8 -591,6 +750,8 @@@ msgstr "
"Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
"Underhåll av lösenordscache\n"
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -768,9 -599,6 +760,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:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -792,22 -618,18 +784,22 @@@ msgstr "
"Syntax: gpg-protect-tool [flaggor] [argument]\n"
"Underhållsverktyg för hemliga nycklar\n"
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Ange lösenfrasen för att avskydda PKCS#12-objektet."
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
"Ange lösenfrasen för att skydda det importerade objektet inom GnuPG-systemet."
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -815,16 -637,13 +807,16 @@@ msgstr "
"Ange lösenfrasen eller PIN-koden som\n"
"behövs för att färdigställa denna åtgärd."
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
msgid "cancelled\n"
msgstr "avbruten\n"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -1010,46 -800,34 +1002,46 @@@ msgstr "skyddsalgoritmen %d%s stöds in
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "skyddsalgoritmen %d%s stöds inte\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "fel när ett rör skapades: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error creating a stream for a pipe: %s\n"
msgstr "fel när ett rör skapades: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, c-format
msgid "error forking process: %s\n"
msgstr "fel vid grening av process: %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
#| msgid "waiting for process %d to terminate failed: %s\n"
msgid "waiting for processes to terminate failed: %s\n"
msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, fuzzy, c-format
#| msgid "error running `%s': probably not installed\n"
msgid "error running '%s': probably not installed\n"
msgstr "fel vid körning av \"%s\": antagligen inte installerat\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
#| msgid "error running `%s': exit status %d\n"
msgid "error running '%s': exit status %d\n"
msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, fuzzy, c-format
#| msgid "error running `%s': terminated\n"
msgid "error running '%s': terminated\n"
@@@ -1065,35 -841,14 +1057,17 @@@ msgstr "fel vid hämtning av avslutsko
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "kan inte ansluta till \"%s\": %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "kommunikationsproblem med gpg-agent\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
msgid "problem setting the gpg-agent options\n"
msgstr "inställningsproblem för gpg-agent\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- msgid "canceled by user\n"
- msgstr "avbruten av användaren\n"
-
- #: common/simple-pwquery.c:579
- msgid "problem with the agent\n"
- msgstr "problem med agenten\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- #| msgid "problem with the agent: %s\n"
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "problem med agenten: %s\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "kan inte stänga av minnesutskrifter: %s\n"
@@@ -1180,7 -918,6 +1154,7 @@@ msgstr "%s:%u: föråldrad flagga \"%s\
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1207,19 -940,16 +1181,19 @@@ msgstr "
msgid "connection to agent is in restricted mode\n"
msgstr "kan inte ansluta till dirmngr - försöker falla tillbaka\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, fuzzy, c-format
#| msgid "no running dirmngr - starting `%s'\n"
msgid "no running Dirmngr - starting '%s'\n"
msgstr "ingen körande dirmngr - startar \"%s\"\n"
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, fuzzy, c-format
#| msgid "waiting %d seconds for the agent to come up\n"
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "väntar %d sekunder för att agenten ska komma igång\n"
- #: common/asshelp.c:672
++#: common/asshelp.c:639
#, fuzzy
#| msgid "can't connect to the dirmngr - trying fall back\n"
msgid "connection to the dirmngr established\n"
@@@ -1483,7 -1153,6 +1457,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:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
msgid "out of core\n"
msgstr "slut på minne\n"
@@@ -1546,7 -1204,10 +1520,13 @@@ msgstr "låset \"%s\" gjordes inte: %s\
msgid "waiting for lock %s...\n"
msgstr "väntar på låset %s...\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr "%s är för gammal (behöver %s, har %s)\n"
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "ASCII-skal: %s\n"
@@@ -1793,10 -1399,6 +1773,10 @@@ msgstr "Url för att hämta publik nyck
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Fel: URL:en är för lång (gränsen är %d tecken).\n"
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
@@@ -2100,28 -1637,19 +2080,28 @@@ msgstr "Administrationskommandon tillå
msgid "Invalid command (try \"help\")\n"
msgstr "Ogiltigt kommando (prova med \"help\")\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output kan inte användas för detta kommando\n"
# se förra kommentaren
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "kan inte öppna \"%s\"\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "nyckeln \"%s\" hittades inte: %s\n"
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "fel vid läsning av nyckelblock: %s\n"
@@@ -2182,39 -1698,32 +2162,39 @@@ msgstr "det finns en hemlig nyckel fö
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "använd flaggan \"--delete-secret-keys\"för att ta bort den först.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "fel när lösenfras skapades: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "kan inte använda symmetriska ESK-paket pga S2K-läge\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "använder %s-chiffer\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "\"%s\" är redan komprimerad\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "VARNING: \"%s\" är en tom fil\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "läser från \"%s\"\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2222,7 -1731,6 +2202,7 @@@ msgstr "
"VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
"mottagarinställningarna\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2231,18 -1739,15 +2211,18 @@@ msgstr "
"VARNING: tvinga komprimeringsalgoritmen %s (%d) strider mot "
"mottagarinställningarna\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s krypterad för: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "du kan inte använda %s när du är i %s-läget\n"
@@@ -2353,8 -1837,6 +2333,8 @@@ msgstr "ta bort så mycket som möjlig
msgid " - skipped"
msgstr "%s: hoppade över: %s\n"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2389,8 -1864,6 +2369,8 @@@ msgstr "Fel när \"%s\" skapades: %s\n
msgid "[User ID not found]"
msgstr "[Användaridentiteten hittades inte]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
@@@ -2463,212 -1923,163 +2443,212 @@@ msgstr "
msgid "using subkey %s instead of primary key %s\n"
msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
msgid "make a signature"
msgstr "skapa en signatur"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
msgid "make a clear text signature"
msgstr "skapa en klartextsignatur"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "skapa signatur i en separat fil"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "kryptera data"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "kryptering endast med symmetriskt chiffer"
# gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "dekryptera data (standard)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "validera en signatur"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "lista nycklar"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "lista nycklar och signaturer"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "list and check key signatures"
msgstr "lista och kontrollera nyckelsignaturer"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "lista nycklar och fingeravtryck"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "lista hemliga nycklar"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "generera ett spärrcertifikat"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "ta bort nycklar från den publika nyckelringen"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "ta bort nycklar från den hemliga nyckelringen"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "signera en nyckel"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "signera en nyckel lokalt"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "signera en nyckel"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "signera en nyckel lokalt"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "signera eller redigera en nyckel"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "ändra en lösenfras"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "exportera nycklar"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "exportera nycklar till en nyckelserver"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "importera nycklar från en nyckelserver"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "sök efter nycklar hos en nyckelserver"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "importera/slå samman nycklar"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr "skriv ut kortstatus"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr "ändra data på ett kort"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr "ändra PIN-kod för ett kort"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "uppdatera tillitsdatabasen"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
msgid "print message digests"
msgstr "skriv ut kontrollsummor"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "kör i serverläge"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "skapa utdata med ett ascii-skal"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ANVÄNDAR-ID|kryptera för ANVÄNDAR-ID"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|ANVÄNDAR-ID|använd ANVÄNDAR-ID för att signera eller dekryptera"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|ställ in komprimeringsnivån till N (0 för att inaktivera)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "använd \"ursprunglig text\"-läget"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FIL|skriv utdata till FIL"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "gör inga ändringar"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "fråga innan överskrivning"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr "använd strikt OpenPGP-beteende"
# inställningar istället för flaggor?
# Nej, här är det bruksanvisningen för kommandoraden.
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2676,7 -2087,6 +2656,7 @@@ msgstr "
"@\n"
"(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2696,14 -2106,12 +2676,14 @@@ msgstr "
"--list-keys [namn] visa nycklar\n"
"--fingerprint [namn] visa fingeravtryck\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
# Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2718,7 -2126,6 +2698,7 @@@ msgstr "
"signera, kontrollera, kryptera eller dekryptera\n"
"standardåtgärden beror på inmatningsdata\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2726,84 -2133,69 +2706,84 @@@ msgstr "
"\n"
"Algoritmer som stöds:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "Publik nyckel: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Chiffer: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Kontrollsumma: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Komprimering: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "användning: gpgsm [flaggor] "
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "motstridiga kommandon\n"
# Vad betyder detta?
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, fuzzy, c-format
#| msgid "no = sign found in group definition `%s'\n"
msgid "no = sign found in group definition '%s'\n"
msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "VARNING: osäkert ägarskap på hemkatalogen \"%s\"\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "VARNING: osäkert ägarskap på konfigurationsfilen \"%s\"\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on extension `%s'\n"
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "VARNING: osäkert ägarskap på tillägget \"%s\"\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "VARNING: osäkra rättigheter på hemkatalogen \"%s\"\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "VARNING: osäkra rättigheter på konfigurationsfilen \"%s\"\n"
# Extension är vad? FIXME
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on extension `%s'\n"
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "VARNING: osäkra rättigheter på tillägget \"%s\"\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"VARNING: osäkert ägarskap på inneslutande katalog för hemkatalogen \"%s\"\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2813,21 -2205,18 +2793,21 @@@ msgstr "
"VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen "
"\"%s\"\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"VARNING: osäkert ägarskap på inneslutande katalog för tillägget \"%s\"\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"VARNING: osäkra rättigheter på inneslutande katalog för hemkatalogen \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2838,529 -2227,413 +2818,524 @@@ msgstr "
"VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
"\"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"VARNING: osäkra rättigheter på inneslutande katalog för tillägget \"%s\"\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "okänd konfigurationspost \"%s\"\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr "visa foto-id under nyckellistning"
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
#, fuzzy
#| msgid "show user ID validity during key listings"
msgid "show key usage information during key listings"
msgstr "visa giltighet för användaridentitet vid nyckellistningar "
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr "visa policy-url:er under signaturlistningar"
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
msgid "show all notations during signature listings"
msgstr "visa alla notationer under signaturlistningar"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr "visa IETF-standardnotationer under signaturlistningar"
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr "visa användarangivna notationer under signaturlistningar"
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
msgid "show preferred keyserver URLs during signature listings"
msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr "visa giltighet för användaridentitet vid nyckellistningar "
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
msgid "show the keyring name in key listings"
msgstr "visa nyckelringens namn i nyckellistningar"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
msgid "show expiration dates during signature listings"
msgstr "visa utgångsdatum under signaturlistningar"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "Tillgängliga nycklar:\n"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "okänd flagga \"%s\"\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- #| msgid "unknown command `%s'\n"
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "okänt kommando \"%s\"\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, fuzzy, c-format
#| msgid "NOTE: old default options file `%s' ignored\n"
msgid "Note: old default options file '%s' ignored\n"
msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr "libgcrypt är för gammalt (behöver %s, har %s)\n"
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "OBS: %s är inte för normal användning!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, fuzzy, c-format
#| msgid "`%s' is not a valid signature expiration\n"
msgid "'%s' is not a valid signature expiration\n"
msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ #| msgid "line %d: not a valid email address\n"
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "rad %d: inte en giltig e-postadress\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, fuzzy, c-format
#| msgid "invalid country code in `%s', line %d\n"
msgid "invalid pinentry mode '%s'\n"
msgstr "ogiltig landskod i \"%s\", rad %d\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, fuzzy, c-format
#| msgid "`%s' is not a valid character set\n"
msgid "'%s' is not a valid character set\n"
msgstr "\"%s\" är ingen giltig teckentabell\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "kunde inte tolka url till nyckelserver\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
msgid "invalid keyserver options\n"
msgstr "ogiltiga flaggor för nyckelserver\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ogiltiga importeringsflaggor\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "ogiltiga importflaggor\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "ogiltiga listflaggor\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ogiltiga exportflaggor\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "ogiltiga exportinställningar\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ogiltiga listflaggor\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
msgid "invalid list options\n"
msgstr "ogiltiga listflaggor\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr "visa foto-id under signaturvalidering"
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr "visa policy-url:er under signaturvalidering"
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
msgid "show all notations during signature verification"
msgstr "visa alla notationer under signaturvalidering"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr "visa IETF-standardnotationer under signaturvalidering"
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr "visa användarangivna notationer under signaturvalidering"
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
msgid "show preferred keyserver URLs during signature verification"
msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
msgid "show user ID validity during signature verification"
msgstr "visa giltighet för användaridentitet vid signaturvalidering"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
msgid "show only the primary user ID in signature verification"
msgstr "visa endast primär användaridentitet i signaturvalidering"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr "validera signaturer med PKA-data"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr "öka tillit på signaturer med giltigt PKA-data"
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ogiltiga flaggor för validering\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
msgid "invalid verify options\n"
msgstr "ogiltiga flaggor för validering\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "kunde inte ställa in exec-path till %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
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:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VARNING: %s gäller istället för %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s är inte tillåten tillsammans med %s!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr "VARNING: kör med falsk systemtid: "
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "kommer inte att köra med osäkert minne på grund av %s\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "den valda chifferalgoritmen är ogiltig\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "vald sammandragsalgoritm är ogiltig\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
msgid "selected compression algorithm is invalid\n"
msgstr "vald komprimeringsalgoritm är ogiltig\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "vald algoritm för certifieringssammandrag är felaktig\n"
# antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
# antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
# Hur djupt GnuPG ska leta i Web-of-trust.
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth måste vara inom intervallet från 1 till 255\n"
# Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr ""
"ogiltigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
# Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ogiltigt minimivärde för certifieringsnivån; måste vara 1, 2 eller 3\n"
# S2K har med krypteringen av hemliga nyckeln att göra
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "ogiltiga standardinställningar\n"
# Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "ogiltig inställning av personligt chiffer\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s fungerar ännu inte med %s\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, fuzzy, c-format
#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, fuzzy, c-format
#| msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr ""
"du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, fuzzy, c-format
#| msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr ""
"du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [filnamn]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [filnamn]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, fuzzy, c-format
#| msgid "symmetric encryption of `%s' failed: %s\n"
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [filnamn]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filnamn]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "du kan inte använda --symmetric --encrypt med --s2k-mode 0\n"
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "du kan inte använda --symmetric --encrypt i %s-läget\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [filnamn]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnamn]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filnamn]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "du kan inte använda --symmetric --sign --encrypt med --s2k-mode 0\n"
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
"du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnamn]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [filnamn]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [filnamn]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key användaridentitet"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key användaridentitet"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key användaridentitet [kommandon]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
msgid "--passwd <user-id>"
msgstr "--passwd <användaridentitet>"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "sändning till nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "hämtning från nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "export av nyckeln misslyckades: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "export av nyckeln misslyckades: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "sökning på nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "uppdatering av nyckeln från en nyckelserver misslyckades: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "misslyckades med att skapa ASCII-skal: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error parsing key specification '%s': %s\n"
msgstr "fel vid lagring av certifikat: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[filnamn]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Skriv ditt meddelande här ...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
@@@ -3405,138 -2670,110 +3380,138 @@@ msgstr "Det finns ingen hjälp tillgän
msgid "No help available for '%s'"
msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr "importera signaturer som är markerade som endast lokala"
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr "reparera skada från pks-nyckelservern under importering"
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "uppdatera inte tillitsdatabasen efter importering"
- #: g10/import.c:143
++#: g10/import.c:147
msgid "do not update the trustdb after import"
msgstr "uppdatera inte tillitsdatabasen efter importering"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "visa nyckelns fingeravtryck"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr "acceptera endast uppdateringar till befintliga nycklar"
- #: g10/import.c:152
++#: g10/import.c:156
msgid "remove unusable parts from key after import"
msgstr "ta bort oanvändbara delar från nyckeln efter importering"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr "ta bort så mycket som möjligt från nyckeln efter importering"
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "hoppar över block av typen %d\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu nycklar behandlade än så länge\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Totalt antal behandlade enheter: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " överhoppade nya nycklar: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " överhoppade nya nycklar: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " utan användaridentiteter: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importerade: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " oförändrade: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nya användaridentiteter: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nya undernycklar: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " nya signaturer: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nya nyckelspärrningar: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " antal lästa hemliga nycklar: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importerade hemliga nycklar: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " oförändrade hemliga nycklar: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " inte importerade: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signaturer rensade: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " användaridentiteter rensade: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3545,198 -2782,160 +3520,198 @@@ msgstr "
"VARNING: nyckeln %s innehåller inställningar för otillgängliga\n"
"algoritmer för dessa användaridentiteter:\n"
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": inställning för chifferalgoritmen %s\n"
- #: g10/import.c:1042
++#: g10/import.c:1048
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": inställning för sammandragsalgoritmen %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": inställning för komprimeringsalgoritmen %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "det rekommenderas starkt att du uppdaterar dina inställningar\n"
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"och distribuerar denna nyckel igen för att undvika tänkbara problem\n"
"med att algoritmerna inte stämmer\n"
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"du kan uppdatera dina inställningar med: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, c-format
msgid "key %s: no user ID\n"
msgstr "nyckel %s: ingen användaridentitet\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "hoppade över \"%s\": %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr ""
# Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
- #: g10/import.c:1264
++#: g10/import.c:1343
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "nyckeln %s: PKS-skadad undernyckel reparerades\n"
# vad innebär fnutten i slutet?
- #: g10/import.c:1282
++#: g10/import.c:1361
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "nyckel %s: accepterade icke-självsignerad användaridentitet \"%s\"\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "nyckel %s: inga giltiga användaridentiteter\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "detta kan bero på att det saknas en självsignatur\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "nyckel %s: hittade ingen publik nyckel: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "nyckel %s: ny nyckel - hoppade över\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
# fixme: I appended the %s -wk
- #: g10/import.c:1397
++#: g10/import.c:1481
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "nyckel %s: publika nyckeln \"%s\" importerades\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "nyckel %s: stämmer inte mot vår lokala kopia\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "nyckel %s: kan inte hitta det ursprungliga nyckelblocket: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "nyckel %s: kan inte läsa det ursprungliga nyckelblocket %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "nyckel %s: \"%s\" 1 ny användaridentitet\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "nyckel %s: \"%s\" %d nya användaridentiteter\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "nyckel %s: \"%s\" 1 ny signatur\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "nyckel %s: \"%s\" %d nya signaturer\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "nyckel %s: \"%s\" 1 ny undernyckel\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "nyckel %s: \"%s\" %d nya undernycklar\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "nyckel %s: \"%s\" %d signatur rensad\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "nyckel %s: \"%s\" %d signaturer rensade\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "nyckel %s: \"%s\" %d användaridentitet rensad\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "nyckel %s: \"%s\" %d användaridentiteter rensade\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "nyckel %s: \"%s\" inte ändrad\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, c-format
msgid "key %s: secret key imported\n"
msgstr "nyckel %s: hemlig nyckel importerades\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "hoppade över: hemlig nyckel finns redan\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "key %s: error sending to agent: %s\n"
msgstr "fel vid sändning av %s-kommando: %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key %s: %s\n"
msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
msgid "importing secret keys not allowed\n"
msgstr "import av hemliga nycklar tillåts inte\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "nyckel %s: hemlig nyckel med ogiltigt chiffer %d - hoppade över\n"
@@@ -3751,143 -2950,116 +3726,143 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "nyckel %s: ingen publik nyckel - kan inte verkställa spärrcertifikat\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - avvisat\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "nyckel %s: \"%s\" spärrcertifikat importerat\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "nyckel %s: ingen användaridentitet för signaturen\n"
# fixme: I appended the %s -wk
- #: g10/import.c:2308
++#: g10/import.c:2401
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"nyckel %s: algoritmen för publika nycklar stöds inte för "
"användaridentiteten \"%s\"\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "nyckel %s: ogiltig självsignatur på användaridentiteten \"%s\"\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "nyckel %s: ogiltig direkt nyckelsignatur\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "nyckel %s: ingen undernyckel för nyckelbindning\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "nyckel %s: ogiltig undernyckelbindning\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "nyckel %s: tog bort flera undernyckelbindningar\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "nyckel %s: ingen undernyckel för nyckelspärrning\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "nyckel %s: ogiltig spärr av undernyckel\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "nyckel %s: tog bort flera spärrar av undernyckel\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "nyckel %s: hoppade över användaridentiteten \"%s\"\n"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "nyckel %s: hoppade över undernyckel\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "nyckel %s: icke-exporterbar signatur (klass 0x%02X) - hoppade över\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "nyckel %s: spärrcertifikat på fel plats - hoppade över\n"
# nyckeln eller certifikatet??
- #: g10/import.c:2545
++#: g10/import.c:2638
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - hoppade över\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "nyckel %s: signatur på undernyckel på fel plats - hoppade över\n"
# nyckeln eller klassen?
- #: g10/import.c:2567
++#: g10/import.c:2660
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "nyckel %s: oväntad signaturklass (0x%02X) - hoppade över\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr ""
"nyckel %s: dubblett av användaridentiteten hittades - slog samman dem\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "VARNING: nyckeln %s kan ha spärrats: hämtar spärrnyckeln %s\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "VARNING: nyckeln %s kan ha spärrats: spärrnyckeln %s saknas.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "nyckel %s: \"%s\" spärrcertifikat lades till\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
@@@ -4234,8 -3344,6 +4209,8 @@@ msgstr "Jag har gjort en noggrann kontr
msgid "Really sign? (y/N) "
msgstr "Verkligen signera? (j/N) "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "signeringen misslyckades: %s\n"
@@@ -4715,13 -3721,9 +4690,13 @@@ msgstr "
"Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
"såvida inte du startar om programmet.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
msgid "revoked"
msgstr "spärrad"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "utgånget"
@@@ -5693,13 -4517,11 +5668,13 @@@ msgstr "Nyckelns fingeravtryck =
msgid " Card serial no. ="
msgstr " Kortets serienr ="
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "mellanlagrar nyckelringen \"%s\"\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5707,14 -4529,12 +5682,14 @@@ msgid_plural "%lu keys cached so far (%
msgstr[0] "%lu nycklar mellanlagrade än så länge (%lu signaturer)\n"
msgstr[1] "%lu nycklar mellanlagrade än så länge (%lu signaturer)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5722,7 -4542,6 +5697,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 felaktig signatur\n"
msgstr[1] "1 felaktig signatur\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: nyckelring skapad\n"
@@@ -5947,120 -4721,101 +5922,126 @@@ msgstr "
msgid "no signature found\n"
msgstr "ingen signatur hittades\n"
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, c-format
msgid "BAD signature from \"%s\""
msgstr "FELAKTIG signatur från \"%s\""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Utgången signatur från \"%s\""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, c-format
msgid "Good signature from \"%s\""
msgstr "Korrekt signatur från \"%s\""
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "signaturvalidering utlämnad\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
msgid "can't handle this ambiguous signature data\n"
msgstr "kan inte hantera detta tvetydliga signaturdata\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, c-format
msgid "Signature made %s\n"
msgstr "Signatur gjord %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, c-format
msgid " using %s key %s\n"
msgstr " med %s-nyckeln %s\n"
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Signatur gjordes %s med %s nyckel-id %s\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ #| msgid " aka \"%s\""
+ msgid " issuer \"%s\"\n"
+ msgstr " även känd som \"%s\""
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "Nyckeln tillgänglig hos: "
# Visas vid ogiltig signatur:
# Eftersom signaturen är ogiltig kan man inte vara säker på att angivet namn och nyckel-id är riktigt.
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[osäkert]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, c-format
msgid " aka \"%s\""
msgstr " även känd som \"%s\""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "Giltighetstiden för signaturen har upphört %s\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "Giltighetstiden för signaturen går ut %s\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s signatur, sammandragsalgoritm %s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "binär"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "textläge"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "okänd"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algoritm: %s"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Kan inte kontrollera signaturen: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "detta är inte någon signatur i en separat fil\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"VARNING: multipla signaturer upptäckta. Endast den första kommer att "
"kontrolleras.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "fristående signatur av klassen 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "signatur av den gamla (PGP 2.x) typen\n"
@@@ -6248,95 -4968,50 +6229,61 @@@ msgstr "VARNING: potentiellt osäker sy
msgid "subpacket of type %d has critical bit set\n"
msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, c-format
msgid "problem with the agent: %s\n"
msgstr "problem med agenten: %s\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, c-format
- msgid " (main key ID %s)"
- msgstr " (primära nyckelns id %s)"
-
- #: g10/passphrase.c:277
- #, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Ange lösenfrasen för att låsa upp den hemliga nyckeln för OpenPGP-"
- "certifikatet:\n"
- "\"%.*s\"\n"
- "%u-bitars %s-nyckel, ID %s,\n"
- "skapad %s%s.\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Ange lösenfrasen\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "avbruten av användaren\n"
- #: g10/passphrase.c:483
++#: g10/passphrase.c:489
#, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "Du behöver en lösenfras för att låsa upp den hemliga\n"
- "nyckeln för användaren: \"%s\"\n"
-
- #: g10/passphrase.c:491
- #, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%u-bitars %s-nyckel, id %s, skapad %s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr " (undernyckel på primärt nyckel-id %s)"
+ msgid " (main key ID %s)"
+ msgstr " (primära nyckelns id %s)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
#, fuzzy
#| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Ange lösenfrasen för att avskydda PKCS#12-objektet."
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, fuzzy, c-format
#| msgid "%u-bit %s key, ID %s, created %s"
msgid ""
@@@ -6538,130 -5178,103 +6485,130 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "Vill du använda nyckeln ändå? (j/N) "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "VARNING: Använder en nyckel som inte är betrodd!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "VARNING: denna nyckel kan ha spärrats (spärrnyckeln saknas)\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "VARNING: Denna nyckel har spärrats av sin ägare!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
msgid " This could mean that the signature is forged.\n"
msgstr " Detta kan betyda att signaturen är förfalskad.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "VARNING: Denna undernyckel har spärrats av sin ägare!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Obs: Denna nyckel har stängts av.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, fuzzy, c-format
#| msgid "Note: Verified signer's address is `%s'\n"
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Observera: Validerad adress för signeraren är \"%s\"\n"
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, fuzzy, c-format
#| msgid "Note: Signer's address `%s' does not match DNS entry\n"
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "Observera: Signerarens adress \"%s\" matchar inte DNS-objektet\n"
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "trustlevel justerad till FULL på grund av giltig PKA-info\n"
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "trustlevel justerad till NEVER på grund av felaktig PKA-info\n"
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Obs: Giltighetstiden för denna nyckel har gått ut!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "VARNING: Denna nyckel är inte certifierad med en pålitlig signatur!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Det finns inget som indikerar att signaturen tillhör ägaren.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "VARNING: Vi litar INTE på denna nyckel!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " Signaturen är sannolikt en FÖRFALSKNING.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"VARNING: Denna nyckel är inte certifierad med signaturer med ett\n"
"tillräckligt högt tillitsvärde!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
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:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: hoppade över: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n"
# överhoppad?
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: hoppades över: publik nyckel finns redan\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, 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:991
++#: g10/pkclist.c:995
#, 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:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr "Nuvarande mottagare:\n"
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6669,24 -5282,19 +6616,24 @@@ msgstr "
"\n"
"Ange användaridentiteten. Avsluta med en tom rad: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Ingen sådan användaridentitet.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
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:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "Den publika nyckeln är inaktiverad.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "hoppade över: publik nyckel redan angiven\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "okänd standardmottagare \"%s\"\n"
@@@ -6694,16 -5302,13 +6641,16 @@@
# plural av adressee
# dvs. den som meddelandet är adresserat till.
# Åtskillnad görs mellan adressee och receiver.
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "inga giltiga adressater\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, 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:1649
++#: g10/pkclist.c:1653
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Observera: nyckeln %s har ingen inställning för %s\n"
@@@ -7001,7 -5554,6 +6948,7 @@@ msgstr[0] "den publika nyckeln %s är %
msgstr[1] "den publika nyckeln %s är %lu sekund nyare än signaturen\n"
# c-format behövs inte i singularis
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -7083,12 -5626,10 +7030,12 @@@ msgstr "
"VARNING: kunde inte %%-expandera url för föredragen nyckelserver (för "
"stor). Använder oexpanderad.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s signatur från: \"%s\"\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -7096,11 -5637,9 +7043,11 @@@ msgstr "
"VARNING: tvinga sammandragsalgoritmen %s (%d) strider mot "
"mottagarinställningarna\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "signerar:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "krypteringen %s kommer att användas\n"
@@@ -7211,7 -5730,6 +7158,7 @@@ msgstr "tillitsdatabastransaktion för
msgid "%s: directory does not exist!\n"
msgstr "%s: katalogen finns inte!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7323,134 -5819,104 +7270,126 @@@ msgstr "kan inte hantera text med rade
msgid "input line longer than %d characters\n"
msgstr "indataraden är längre än %d tecken\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "fel vid sändning av standardflaggor: %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "algoritmen stöds inte: %s"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "fel vid sändning av %s-kommando: %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: fel vid läsning av katalogpost: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "fel vid öppnandet av \"%s\": %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "fel vid sändning av %s-kommando: %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "fel vid hämtning av ny PIN-kod: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "giltighet: %s"
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "fel vid hämtning av lagrade flaggor: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "lista nycklar"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%ld message signed"
@@@ -7458,21 -5924,18 +7397,21 @@@ msgid_plural "%ld messages signed
msgstr[0] "skriv ut kontrollsummor"
msgstr[1] "skriv ut kontrollsummor"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7482,28 -5945,23 +7421,28 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
#| msgid "error storing flags: %s\n"
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "fel vid lagring av flaggor: %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
@@@ -7511,67 -5969,57 +7450,67 @@@ msgstr "fel när ett rör skapades: %s\
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %ld messages signed by \"%s\"."
msgstr "skriv ut kontrollsummor"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7582,20 -6030,16 +7521,20 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7612,8 -6056,6 +7551,7 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error opening TOFU database: %s\n"
@@@ -8185,7 -6518,6 +8123,7 @@@ msgstr "|N|Initial PIN-kod
msgid "run in multi server mode (foreground)"
msgstr "kör i multiserverläge (förgrund)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
@@@ -8245,19 -6566,16 +8183,19 @@@ msgstr "
"Syntax: scdaemon [flaggor] [kommando [argument]]\n"
"Smartkortsdemon för GnuPG\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
#, 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:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr "hanterare för fd %d startad\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "hanterare för fd %d avslutad\n"
@@@ -8362,12 -6657,10 +8300,12 @@@ msgstr "se till att \"dirmngr\" är kor
msgid "checking the CRL failed: %s"
msgstr "kontroll mot spärrlistan misslyckades: %s"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr "certifikat med felaktig giltighetstid: %s"
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr "certifikatet är ännu inte giltigt"
@@@ -8379,7 -6670,6 +8317,7 @@@ msgstr "rotcertifikatet är ännu inte
msgid "intermediate certificate not yet valid"
msgstr "tillfälligt certifikat är ännu inte giltigt"
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
msgid "certificate has expired"
msgstr "certifikatet har gått ut"
@@@ -8428,7 -6707,6 +8366,7 @@@ msgstr " (certifikat giltigt från
msgid " ( issuer valid from "
msgstr " ( utfärdare giltig från "
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, c-format
msgid "fingerprint=%s\n"
msgstr "fingeravtryck=%s\n"
@@@ -8458,7 -6730,6 +8396,7 @@@ msgstr "ingen utfärdare hittades i cer
msgid "self-signed certificate has a BAD signature"
msgstr "självsignerat certifikat har en FELAKTIG signatur"
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr "rotcertifikatet har inte markerats som betrott"
@@@ -8467,28 -6737,22 +8405,28 @@@
msgid "checking the trust list failed: %s\n"
msgstr "kontroll mot tillitslistan misslyckades: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr "certifikatkedjan är för lång\n"
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr "utfärdarens certifikat hittades inte"
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
msgid "certificate has a BAD signature"
msgstr "certifikatet har en FELAKTIG signatur"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr "hittade ett annat möjligen matchande CA-certifikat - försöker igen"
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr "certifikatkedjan längre än vad som tillåts av CA (%d)"
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
msgid "certificate is good\n"
msgstr "certifikatet är korrekt\n"
@@@ -8518,7 -6776,6 +8456,7 @@@ msgstr "en %u-bitars hash är inte gilt
msgid "(this is the MD2 algorithm)\n"
msgstr "(det här är MD2-algoritmen)\n"
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
msgid "none"
msgstr "ingen"
@@@ -8553,44 -6805,36 +8491,44 @@@ msgstr "
"S/N %s, ID 0x%08lX,\n"
"skapad %s, går ut %s.\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr "ingen nyckelanvändning angiven - antar alla användningsområden\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "fel vid hämtning av nyckelanvändningsinformation: %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
#, fuzzy
#| msgid "certificate should have not been used for certification\n"
msgid "certificate should not have been used for certification\n"
msgstr "certifikatet skulle inte använts för certifiering\n"
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
#, fuzzy
#| msgid "certificate should have not been used for OCSP response signing\n"
msgid "certificate should not have been used for OCSP response signing\n"
msgstr "certifikatet skulle inte använts för signering av OCSP-svar\n"
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
#, fuzzy
#| msgid "certificate should have not been used for encryption\n"
msgid "certificate should not have been used for encryption\n"
msgstr "certifikatet skulle inte använts för kryptering\n"
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
#, fuzzy
#| msgid "certificate should have not been used for signing\n"
msgid "certificate should not have been used for signing\n"
msgstr "certifikatet skulle inte använts för signering\n"
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr "certifikatet är inte användbart för kryptering\n"
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr "certifikatet är inte användbart för signering\n"
@@@ -9047,23 -7201,19 +8985,23 @@@ msgstr "%s:%u: lösenord angivet utan a
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: hoppar över denna rad\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
msgid "could not parse keyserver\n"
msgstr "kunde inte tolka nyckelserver\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, fuzzy, c-format
#| msgid "importing common certificates `%s'\n"
msgid "importing common certificates '%s'\n"
msgstr "importerar vanliga certifikat \"%s\"\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, 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:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr "ogiltigt kommando (det finns inget implicit kommando)\n"
@@@ -9124,7 -7262,6 +9062,7 @@@ msgstr "problem vid ytterligare söknin
msgid "error storing flags: %s\n"
msgstr "fel vid lagring av flaggor: %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr "Fel - "
@@@ -9256,112 -7372,87 +9194,106 @@@ msgstr "problem vid sökandet efter bef
msgid "dropping %u certificates from the cache\n"
msgstr "slår upp utfärdare från Dirmngr-cachen\n"
- #: dirmngr/certcache.c:352
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
- msgid "can't access directory '%s': %s\n"
- msgstr "%s: kan inte skapa katalog: %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't parse certificate '%s': %s\n"
msgstr "kan inte skapa \"%s\": %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, fuzzy, c-format
#| msgid "certificate `%s' deleted\n"
msgid "certificate '%s' already cached\n"
msgstr "certifikatet \"%s\" togs bort\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, fuzzy, c-format
#| msgid "duplicated certificate `%s' deleted\n"
msgid "trusted certificate '%s' loaded\n"
msgstr "dubblett av certifikatet \"%s\" borttaget\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, fuzzy, c-format
#| msgid "certificate `%s' deleted\n"
msgid "certificate '%s' loaded\n"
msgstr "certifikatet \"%s\" togs bort\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, fuzzy, c-format
#| msgid "fingerprint=%s\n"
msgid " SHA1 fingerprint = %s\n"
msgstr "fingeravtryck=%s\n"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error loading certificate '%s': %s\n"
msgstr "fel vid lagring av certifikat: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, fuzzy, c-format
#| msgid "Included certificates"
msgid "permanently loaded certificates: %u\n"
msgstr "Inkluderade certifikat"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, fuzzy, c-format
#| msgid "number of matching certificates: %d\n"
msgid " runtime cached certificates: %u\n"
msgstr "antal matchande certifikat: %d\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
#, fuzzy
#| msgid " (certificate created at "
msgid "certificate already cached\n"
msgstr " (certifikat skapat "
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate cached\n"
msgstr "certifikatet är korrekt\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error caching certificate: %s\n"
msgstr "fel vid lagring av certifikat: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "ogiltigt fingeravtryck"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error fetching certificate by S/N: %s\n"
msgstr "fel vid lagring av certifikat: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error fetching certificate by subject: %s\n"
msgstr "fel vid lagring av certifikat: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
#, fuzzy
#| msgid "no issuer found in certificate"
msgid "no issuer found in certificate\n"
msgstr "ingen utfärdare hittades i certifikatet"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error getting authorityKeyIdentifier: %s\n"
@@@ -9648,7 -7688,6 +9580,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "fel vid hämtning av lagrade flaggor: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
@@@ -9669,7 -7705,6 +9601,7 @@@ msgstr "
msgid "converting S-expression failed: %s\n"
msgstr "iconv_open misslyckades: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, fuzzy, c-format
#| msgid "receiving line failed: %s\n"
msgid "creating S-expression failed: %s\n"
@@@ -10105,130 -8060,97 +10037,124 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:159
- #, fuzzy
- #| msgid "run in daemon mode (background)"
- msgid "run as windows service (background)"
- msgstr "kör i demonläge (bakgrund)"
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
#, 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:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "skicka ett kommando till dirmngr"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr "|FIL|skriv serverlägesloggar till FIL"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "Avsluta utan att spara? (j/N) "
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
#, 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:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 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:209
++#: dirmngr/dirmngr.c:196
#, fuzzy
#| msgid "|URL|use keyserver at URL"
msgid "|URL|use OCSP responder at URL"
msgstr "|URL| använd nyckelservern på URL"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
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:241
++#: dirmngr/dirmngr.c:228
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10241,13 -8163,11 +10167,13 @@@ msgstr "
"@\n"
"(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10259,88 -8179,71 +10185,88 @@@ msgstr "
"Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
"Hantering av hemliga nycklar för GnuPG\n"
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, fuzzy, c-format
#| msgid "invalid debug-level `%s' given\n"
msgid "valid debug levels are: %s\n"
msgstr "ogiltig debug-level \"%s\" angiven\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "användning: gpgsm [flaggor] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
#, 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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, 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:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, 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:1594
++#: dirmngr/dirmngr.c:1418
#, 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:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "ogiltigt fingeravtryck"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, 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:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "inte tvingad"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10715,115 -8548,94 +10641,115 @@@ msgstr "kontroll mot tillitslistan miss
msgid "not signed by a default OCSP signer's certificate"
msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, fuzzy, c-format
#| msgid "receiving line failed: %s\n"
msgid "allocating list item failed: %s\n"
msgstr "mottagande rad misslyckades: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error getting responder ID: %s\n"
msgstr "fel vid hämtning av ny PIN-kod: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
#, fuzzy
#| msgid "certificate should have not been used for OCSP response signing\n"
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr "certifikatet skulle inte använts för signering av OCSP-svar\n"
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, fuzzy, c-format
#| msgid "issuer certificate not found"
msgid "issuer certificate not found: %s\n"
msgstr "utfärdarens certifikat hittades inte"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
#, fuzzy
#| msgid "error reading list of trusted root certificates\n"
msgid "caller did not return the target certificate\n"
msgstr "fel vid inläsning av betrodda rotcertifikat\n"
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
#, fuzzy
#| msgid "error storing certificate\n"
msgid "caller did not return the issuing certificate\n"
msgstr "fel vid lagring av certifikat\n"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, fuzzy, c-format
#| msgid "failed to allocate keyDB handle\n"
msgid "failed to allocate OCSP context: %s\n"
msgstr "misslyckades med att allokera keyDB-hanterare\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't get authorityInfoAccess: %s\n"
msgstr "kan inte komma åt \"%s\": %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
#, fuzzy
#| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, fuzzy, c-format
#| msgid "using default PIN as %s\n"
msgid "using default OCSP responder '%s'\n"
msgstr "använder standard-PIN som %s\n"
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, fuzzy, c-format
#| msgid "using cipher %s\n"
msgid "using OCSP responder '%s'\n"
msgstr "använder %s-chiffer\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "fel vid lagring av certifikat: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, fuzzy, c-format
#| msgid "certificate has been revoked"
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "certifikatet har spärrats"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr ""
@@@ -10877,36 -8679,30 +10803,36 @@@ msgstr "val misslyckades: %s\n
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, 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:2415
++#: dirmngr/server.c:2377
#, 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:2436
++#: dirmngr/server.c:2398
#, 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:2444
++#: dirmngr/server.c:2406
#, 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:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10935,39 -8727,29 +10861,35 @@@ msgstr "
msgid "checking CRL for"
msgstr "kontroll mot spärrlistan misslyckades: %s"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
#, fuzzy
#| msgid "self-signed certificate has a BAD signature"
msgid "selfsigned certificate has a BAD signature"
msgstr "självsignerat certifikat har en FELAKTIG signatur"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, fuzzy, c-format
#| msgid "checking for qualified certificate failed: %s\n"
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "sökande efter kvalificerat certifikat misslyckades: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate chain is good\n"
msgstr "certifikatet är korrekt\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr ""
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
#, fuzzy
#| msgid "certificate should have not been used for signing\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:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
msgid "quiet"
msgstr "tyst"
@@@ -11104,11 -8855,9 +11026,11 @@@ msgstr "|N|ställ in maximal livstid f�
msgid "Options enforcing a passphrase policy"
msgstr "Flaggor som tvingar igenom en lösenfraspolicy"
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr "tillåt inte att gå förbi lösenfraspolicyn"
+#: tools/gpgconf-comp.c:567
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"
@@@ -11249,77 -8966,61 +11171,77 @@@ msgstr "Extern validering av komponente
msgid "Note that group specifications are ignored\n"
msgstr "Observera att gruppspecifikationer ignoreras\n"
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr "lista alla komponenter"
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr "kontrollera alla program"
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr "|KOMPONENT|lista flaggor"
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr "|KOMPONENT|ändra flaggor"
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr "|KOMPONENT|kontrollera flaggor"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr "tillämpa globala standardvärden"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
#, 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:78
++#: tools/gpgconf.c:79
msgid "list global configuration file"
msgstr "lista global konfigurationsfil"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
msgid "check global configuration file"
msgstr "kontrollera global konfigurationsfil"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
#, fuzzy
#| msgid "list all components"
msgid "reload all or a given component"
msgstr "lista alla komponenter"
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
#, fuzzy
#| msgid "list all components"
msgid "launch a given component"
msgstr "lista alla komponenter"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
#, fuzzy
#| msgid "list all components"
msgid "kill a given component"
msgstr "lista alla komponenter"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "använd som fil för utdata"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr "aktivera ändringar vid körtid, om möjligt"
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
#, 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:119
++#: tools/gpgconf.c:121
#, fuzzy
#| msgid ""
#| "Syntax: gpgconf [options]\n"
@@@ -11331,15 -9032,12 +11253,15 @@@ msgstr "
"Syntax: gpgconf [flaggor]\n"
"Hantera konfigurationsinställningar för verktygen i GnuPG-systemet\n"
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr "Behöver ett komponentargument"
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
msgid "Component not found"
msgstr "Komponenten hittades inte"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
msgid "No argument allowed"
msgstr "Inget argument tillåts"
@@@ -11391,125 -9080,100 +11313,125 @@@ msgstr "
"[flaggor...] KOMMANDO [inmatningsfil]\n"
"Anropa ett enkelt symmetriskt krypteringsverktyg\n"
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s på %s avbröts med status %i\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, c-format
msgid "%s on %s failed with status %i\n"
msgstr "%s på %s misslyckades med status %i\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, fuzzy, c-format
#| msgid "can't create temporary directory `%s': %s\n"
msgid "can't create temporary directory '%s': %s\n"
msgstr "kan inte skapa temporärkatalogen \"%s\": %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr "kunde inte öppna %s för skrivning: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, c-format
msgid "error writing to %s: %s\n"
msgstr "fel vid skrivning till %s: %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, c-format
msgid "error reading from %s: %s\n"
msgstr "fel vid läsning från %s: %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, c-format
msgid "error closing %s: %s\n"
msgstr "fel vid stängning av %s: %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
msgid "no --program option provided\n"
msgstr "flaggan --program angavs inte\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr "endast --decrypt och --encrypt stöds\n"
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr "flaggan --keyfile angavs inte\n"
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr "kan inte allokera argumentvektor\n"
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, c-format
msgid "could not create pipe: %s\n"
msgstr "kunde inte skapa rör: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, c-format
msgid "could not create pty: %s\n"
msgstr "kunde inte skapa pty: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr "kunde inte grena process: %s\n"
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, c-format
msgid "execv failed: %s\n"
msgstr "execv misslyckades: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, c-format
msgid "select failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, c-format
msgid "read failed: %s\n"
msgstr "läsning misslyckades: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, c-format
msgid "pty read failed: %s\n"
msgstr "pty-läsning misslyckades: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, c-format
msgid "waitpid failed: %s\n"
msgstr "waitpid misslyckades: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr "barnprocess avbröts med status %i\n"
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "kan inte allokera infilssträng: %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "kan inte allokera utfilssträng: %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr "antingen %s eller %s måste anges\n"
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr "ingen klass tillhandahölls\n"
# Skyddssammandraget låter underligt
# Kontrollsumma?
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, c-format
msgid "class %s is not supported\n"
msgstr "klassen %s stöds inte\n"
diff --cc po/tr.po
index cbf57fe,14a4492..71ec375
--- a/po/tr.po
+++ b/po/tr.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 2.0.10rc1\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2015-02-11 19:18+0100\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun at belgeler.gen.tr>\n"
"Language-Team: Turkish\n"
@@@ -105,13 -89,9 +105,13 @@@ msgstr "
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
msgid "Passphrase:"
msgstr "Anahtar Parolası:"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr "aynı değiller - tekrar deneyin"
@@@ -151,91 -123,64 +151,91 @@@ msgstr "PIN hatalı
msgid "Bad Passphrase"
msgstr "Anahtar Parolası hatalı"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, 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:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
msgstr "`%s' açılamıyor: %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "kartın seri numarası alınırken hata: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "Algılanan kartın seri nr: %s\n"
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, fuzzy, c-format
#| msgid "error getting default authentication keyID of card: %s\n"
msgid "no authentication key for ssh on card: %s\n"
msgstr "kartın öntanımlı kimlik doğrulama anahtar kimliği alınırken hata: %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "uygun bir kart anahtarı yok: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, c-format
msgid "shadowing the key failed: %s\n"
msgstr "anahtar gölgelenemedi: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, c-format
msgid "error writing key: %s\n"
msgstr "anahtarı yazarken hata: %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Lütfen SSH anahtarı %0A %c için anahtar parolasını giriniz"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Lütfen bu anahtar parolasını tekrar girin"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -244,7 -189,6 +244,7 @@@ msgstr "
"gpg-agent'in anahtar deposuna korumak için alınan gizli anahtar %%0A %s%%0A "
"için lütfen anahtar parolası giriniz"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "sokette akım oluşturulamadı: %s\n"
@@@ -403,8 -321,6 +403,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:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -412,139 -328,101 +412,139 @@@ msgstr "
"@Seçenekler:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr "artalan süreci olarak çalışır"
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr "sunucu olarak (önalanda) çalışır"
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "ayrıntılı"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "biraz daha sessiz olur"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr "sh tarzı komut çıktısı"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr "csh tarzı komut çıktısı"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|DOSYA|seçenekler DOSYAdan okunur"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr "konsoldan kopulmaz"
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr "klavye ve fare gaspedilmez"
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "sunucu için bir günlük dosyası kullanılır"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
msgid "do not use the SCdaemon"
msgstr "Akıllı kart süreci kullanılmaz"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, 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:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr "TTY değiştirme istekleri yoksayılır"
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr "X birimi değiştirme istekleri yoksayılır"
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr "imzalarken PIN arabelleği kullanılmaz"
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, 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:220
++#: agent/gpg-agent.c:219
#, 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:223
++#: agent/gpg-agent.c:222
msgid "allow presetting passphrase"
msgstr "anahtar parolasının önceden atanmasına izin verilir"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
#, fuzzy
#| msgid "enable ssh-agent emulation"
msgid "enable ssh support"
msgstr "ssh-agent öykünümü etkinleşir"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Yazılım hatalarını lütfen <"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
#, 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:484
++#: agent/gpg-agent.c:483
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -556,120 -434,85 +556,112 @@@ msgstr "
"Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
"GnuPG için gizli anahtar yönetimi\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, 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:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr "%s çok eski (gereken %s, sizinki %s)\n"
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "seçenek dosyası \"%s\": %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, 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:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, c-format
msgid "can't create socket: %s\n"
msgstr "soket oluşturulamıyor: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, 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:1844
++#: agent/gpg-agent.c:1843
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:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
msgid "error getting nonce for the socket\n"
msgstr "soket için tuz alınırken hata\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, 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:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, 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:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, c-format
msgid "listen() failed: %s\n"
msgstr "soket dinleme başarısız: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, fuzzy, c-format
#| msgid "listening on socket `%s'\n"
msgid "listening on socket '%s'\n"
msgstr "`%s' soketi dinlemede\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, 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:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
msgstr "dizin `%s' oluşturuldu\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, 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:1958
++#: agent/gpg-agent.c:1957
#, 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:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
@@@ -684,29 -525,23 +676,29 @@@ msgstr "tutamak 0x%lx, fd %d için baş
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:2385
++#: agent/gpg-agent.c:2387
#, 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:2390
++#: agent/gpg-agent.c:2392
#, 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:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, 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:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s durdu\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "bu oturumda çalışan gpg-agent yok\n"
@@@ -723,8 -556,6 +715,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:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -732,9 -563,6 +724,9 @@@ msgstr "
"@Komutlar:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -756,16 -582,13 +748,16 @@@ msgstr "
"Sözdizimi: gpg-protect-tool [seçenekler] [arg ...]\n"
"Gizli anahtar bakım aracı\n"
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr ""
"PKCS#12 nesnesinin korumasını aşmak için lütfen anahtar parolasını giriniz."
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
@@@ -773,7 -596,6 +765,7 @@@ msgstr "
"Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
"giriniz."
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -781,16 -603,13 +773,16 @@@ msgstr "
"Lütfen bu işlemi tamamlamak için gereken\n"
"PIN'i veya anahtar parolasını giriniz."
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
msgid "cancelled\n"
msgstr "iptal edildi\n"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, c-format
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:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -975,46 -765,34 +967,46 @@@ msgstr "koruma algoritması %d%s destek
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "koruma algoritması %d%s desteklenmiyor\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "boru oluşturulurken hata: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error creating a stream for a pipe: %s\n"
msgstr "boru oluşturulurken hata: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, c-format
msgid "error forking process: %s\n"
msgstr "süreç çatallanırken hata: %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
#| msgid "waiting for process %d to terminate failed: %s\n"
msgid "waiting for processes to terminate failed: %s\n"
msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, fuzzy, c-format
#| msgid "error running `%s': probably not installed\n"
msgid "error running '%s': probably not installed\n"
msgstr "`%s' çalıştırılırken hata: muhtemelen kurulu değil\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
#| msgid "error running `%s': exit status %d\n"
msgid "error running '%s': exit status %d\n"
msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, fuzzy, c-format
#| msgid "error running `%s': terminated\n"
msgid "error running '%s': terminated\n"
@@@ -1030,35 -806,14 +1022,17 @@@ msgstr "süreç %d çıkış kodu alın
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "gpg-agent ile haberleşme problemi\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
msgid "problem setting the gpg-agent options\n"
msgstr "gpg-agent seçenekleri ayarlanırken sorun çıktı\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- msgid "canceled by user\n"
- msgstr "kullanıcı tarafından iptal edildi\n"
-
- #: common/simple-pwquery.c:579
- msgid "problem with the agent\n"
- msgstr "aracı ile sorun var\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- #| msgid "problem with the agent: %s\n"
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "aracı ile sorun var: %s\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "\"core\" oluşumu iptal edilemedi: %s\n"
@@@ -1144,7 -882,6 +1118,7 @@@ msgstr "%s:%u: eskimiş seçenek \"%s\
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1170,18 -903,15 +1144,18 @@@ msgstr "
msgid "connection to agent is in restricted mode\n"
msgstr "dirmngr'a bağlanılamıyor - son çareye başvuruluyor\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, fuzzy, c-format
#| msgid "no running dirmngr - starting `%s'\n"
msgid "no running Dirmngr - starting '%s'\n"
msgstr "çalışan dirmngr yok - `%s' başlatılıyor\n"
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:672
++#: common/asshelp.c:639
#, fuzzy
#| msgid "can't connect to the dirmngr - trying fall back\n"
msgid "connection to the dirmngr established\n"
@@@ -1453,7 -1123,6 +1427,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:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
msgid "out of core\n"
msgstr "nüve dışında\n"
@@@ -1516,7 -1174,10 +1490,13 @@@ msgstr "kilit `%s' yapılmadı: %s\n
msgid "waiting for lock %s...\n"
msgstr "%s kilidi için bekleniyor...\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr "%s çok eski (gereken %s, sizinki %s)\n"
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "zırh: %s\n"
@@@ -1758,10 -1364,6 +1738,10 @@@ msgstr "genel anahtarın alınacağı U
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Hata: URL çok uzun (sınır: %d karakter).\n"
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
@@@ -2049,27 -1586,18 +2029,27 @@@ msgstr "Yönetici komutlarına izin ver
msgid "Invalid command (try \"help\")\n"
msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output seçeneği bu komutla çalışmaz\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "`%s' açılamadı\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "anahtar \"%s\" yok: %s\n"
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "anahtar bloğu okunurken hata: %s\n"
@@@ -2130,39 -1646,32 +2110,39 @@@ msgstr "genel anahtar \"%s\" için bir
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "anahtar parolası oluşturulurken hata: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "S2K kipi sayesinde bir simetrik ESK paketi kullanılamıyor\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "%s şifrelemesi kullanılıyor\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' zaten sıkıştırılmış\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "UYARI: \"%s\" dosyası boş\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "`%s'den okunuyor\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2170,7 -1679,6 +2150,7 @@@ msgstr "
"UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
"zorlanıyor\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2179,18 -1687,15 +2159,18 @@@ msgstr "
"UYARI: alıcının tercihleriyle çelişen %s (%d) sıkıştırma algoritması "
"kullanılmak isteniyor\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s \"%s\" için şifrelendi\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
@@@ -2299,8 -1783,6 +2279,8 @@@ msgstr "ihraç sırasında anahtardan m
msgid " - skipped"
msgstr "%s: atlandı: %s\n"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2335,8 -1810,6 +2315,8 @@@ msgstr "`%s' oluşturulurken hata: %s\n
msgid "[User ID not found]"
msgstr "[Kullanıcı kimliği yok]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
@@@ -2409,211 -1869,162 +2389,211 @@@ msgstr "
msgid "using subkey %s instead of primary key %s\n"
msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
msgid "make a signature"
msgstr "bir imza yapar"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
msgid "make a clear text signature"
msgstr "açıkça okunabilen bir imza yapar"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "bağımsız bir imza yapar"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "veriyi şifreler"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "sadece simetrik şifre ile şifreler"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "veri şifresini açar (öntanımlı)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "bir imzayı doğrular"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "anahtarları listeler"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "anahtarları ve imzaları listeler"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "list and check key signatures"
msgstr "anahtar imzalarını listeler ve sınar"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "anahtarları ve parmak izlerini listeler"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "gizli anahtarları listeler"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "yeni bir anahtar çifti üretir"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "yeni bir anahtar çifti üretir"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "yeni bir anahtar çifti üretir"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "yeni bir anahtar çifti üretir"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "bir yürürlükten kaldırma sertifikası üretir"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "anahtarları genel anahtar zincirinden siler"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "anahtarları gizli anahtar zincirinden siler"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "bir anahtarı imzalar"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "bir anahtarı yerel olarak imzalar"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "bir anahtarı imzalar"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "bir anahtarı yerel olarak imzalar"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "bir anahtarı düzenler ve imzalar"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "anahtar parolası değiştirir"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "anahtarları gönderir"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "anahtarları bir anahtar sunucusuna gönderir"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "anahtarları bir anahtar sunucusundan indirir"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "bir anahtar sunucusunda anahtarları arar"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "anahtarları bir anahtar sunucusundan günceller"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "anahtarları indirir/katıştırır"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr "kart durumunu basar"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr "kart üzerindeki veriyi değiştirir"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr "bir kartın PIN'ini değiştirir"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "güvence veritabanını günceller"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
msgid "print message digests"
msgstr "ileti özetlerini gösterir"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "sunucu kipinde çalışır"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "ascii zırhlı çıktı oluşturur"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|KULLANICI-KİMLİĞİ|KULLANICI-KİMLİĞİ için şifreleme yapar"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"|KULLANICI-KİMLİĞİ|imzalamak ya da şifre çözmek için KULLANICI-KİMLİĞİ "
"kullanılır"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 iptal eder)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "kurallı metin kipini kullanır"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|DOSYA|çıktı DOSYAya yazılır"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "hiçbir değişiklik yapmaz"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "üzerine yazmadan önce sorar"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr "kesin OpenPGP davranışı etkin olur"
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2621,7 -2032,6 +2601,7 @@@ msgstr "
"@\n"
"(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2641,13 -2051,11 +2621,13 @@@ msgstr "
" --list-keys [isimler] anahtarları listeler\n"
" --fingerprint [isimler] parmak izlerini gösterir\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2662,7 -2070,6 +2642,7 @@@ msgstr "
"imzalama, kontrol, şifreleme veya çözme\n"
"öntanımlı işlem girilen veriye bağımlıdır\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2670,81 -2077,66 +2650,81 @@@ msgstr "
"\n"
"Desteklenen algoritmalar:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "GenAnah: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Şifre: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Sıkıştırma: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "kullanımı: gpgsm [seçenekler] "
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "çelişen komutlar\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, fuzzy, c-format
#| msgid "no = sign found in group definition `%s'\n"
msgid "no = sign found in group definition '%s'\n"
msgstr "grup tanımı '%s' içinde = işareti yok\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on extension `%s'\n"
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on extension `%s'\n"
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2752,19 -2144,16 +2732,19 @@@ msgid "
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2773,525 -2162,409 +2753,520 @@@ msgid "
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
#, fuzzy
#| msgid "show user ID validity during key listings"
msgid "show key usage information during key listings"
msgstr "anahtar listelemesi sırasında kullanıcı kimliği geçerliliğini gösterir"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
msgid "show all notations during signature listings"
msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr "anahtar listelemesi sırasında kullanıcı kimliği geçerliliğini gösterir"
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr ""
"anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
"kullanıcı kimlikleri gösterilir"
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr ""
"anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
"yardımcı anahtarlar gösterilir"
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
msgid "show the keyring name in key listings"
msgstr "anahtar zinciri ismini anahtar listelerinde gösterir"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
msgid "show expiration dates during signature listings"
msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "anahtarı iptal eder"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "`%s' seçeneği bilinmiyor\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- #| msgid "unknown command `%s'\n"
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "komut `%s' bilinmiyor\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, fuzzy, c-format
#| msgid "NOTE: old default options file `%s' ignored\n"
msgid "Note: old default options file '%s' ignored\n"
msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr "libgcrypt çok eski (%s lazım, sizinki %s)\n"
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "BİLGİ: %s normal kullanım için değil!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, fuzzy, c-format
#| msgid "`%s' is not a valid signature expiration\n"
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s' geçerli bir imza zamanaşımı değil\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ #| msgid "line %d: not a valid email address\n"
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "%d. satır: geçerli bir eposta adresi değil\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, fuzzy, c-format
#| msgid "invalid country code in `%s', line %d\n"
msgid "invalid pinentry mode '%s'\n"
msgstr "`%s', %d. satırındaki ülke kodu geçersiz\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, fuzzy, c-format
#| msgid "`%s' is not a valid character set\n"
msgid "'%s' is not a valid character set\n"
msgstr "'%s' geçerli bir karakter kümesi değil\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
msgid "invalid keyserver options\n"
msgstr "anahtar sunucusu seçenekleri geçersiz\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "içselleştirme seçenekleri geçersiz\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "liste seçenekleri geçersiz\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "dışsallaştırma seçenekleri geçersiz\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: liste seçenekleri geçersiz\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
msgid "invalid list options\n"
msgstr "liste seçenekleri geçersiz\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
msgid "show all notations during signature verification"
msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"imza doğrulaması sırasında tercih edilen anahtar sunucusu adresleri "
"gösterilir"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
msgid "show user ID validity during signature verification"
msgstr "imza doğrulaması sırasında kullanıcı kimliği geçerliliğini gösterir"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"imza doğrulamasında yürürlükten kaldırılan ve zamanaşımına uğrayan kullanıcı "
"kimlikleri gösterilir"
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
msgid "show only the primary user ID in signature verification"
msgstr "imza doğrulamasında sadece birincil kullanıcı kimlik gösterilir"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr "imzaları PKA verisi ile doğrular"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr "imzaların güvenilirliğini geçerli PKA verisi ile yükseltir"
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
msgid "invalid verify options\n"
msgstr "doğrulama seçenekleri geçersiz\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "UYARI: %s %s'i aşıyor\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ile %s birlikte kullanılmaz!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s, %s ile etkisiz olur!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "seçilen özet algoritması geçersiz\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
msgid "selected compression algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "seçilen sertifikalama özet algoritması geçersiz\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "öntanımlı tercihler geçersiz\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "kişisel şifre tercihleri geçersiz\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "kişisel özet tercihleri geçersiz\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s, %s ile henüz çalışmıyor\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, fuzzy, c-format
#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, fuzzy, c-format
#| msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "%2$s kipindeyken '%1$s' özet algoritması kullanılamaz\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, fuzzy, c-format
#| msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "%2$s kipindeyken '%1$s' sıkıştırma algoritması kullanılamaz\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [dosyaismi]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [dosyaismi]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, fuzzy, c-format
#| msgid "symmetric encryption of `%s' failed: %s\n"
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [dosyaismi]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [dosyaismi]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--s2k-mode 0 ile --symmetric --encrypt kullanamazsınız\n"
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "%s kipindeyken --symmetric --encrypt kullanamazsınız\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [dosyaismi]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosyaismi]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [dosyaismi]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "--s2k-mode 0 ile --symmetric --sign --encrypt kullanamazsınız\n"
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [DOSYA]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [dosyaismi]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [dosyaismi]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key kullanıcı-kimliği"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key kullanıcı-kimliği"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kullanıcı-kimliği [komutlar]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key kullanıcı-kimliği"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "anahtar sunucusundan alım başarısızlığa uğradı: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "anahtar sunucusunda arama başarısız: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zırhın kaldırılması başarısız: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "zırhlama başarısız: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "`%s' çittirim algoritması geçersiz\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error parsing key specification '%s': %s\n"
msgstr "serifika saklanırken hata: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[dosyaismi]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "İletinizi yazın ...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "belirtilen sertifika güvence adresi geçersiz\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "belirtilen imza güvence adresi geçersiz\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
msgid "the given preferred keyserver URL is invalid\n"
msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
@@@ -3334,138 -2599,110 +3309,138 @@@ msgstr "yardım mevcut değil
msgid "No help available for '%s'"
msgstr "\"%s\" için yardım mevcut değil"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr "salt-yerel olarak imlenmiş imzaları ithal eder"
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr "ithalat sırasında pks anahtar sunucusundaki bozukluğu giderir"
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "ithalat sonrası güvence veritabanını güncellemez"
- #: g10/import.c:143
++#: g10/import.c:147
msgid "do not update the trustdb after import"
msgstr "ithalat sonrası güvence veritabanını güncellemez"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "parmakizini gösterir"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr "güncellemeleri sadece mevcut anahtarlar için kabul eder"
- #: g10/import.c:152
++#: g10/import.c:156
msgid "remove unusable parts from key after import"
msgstr "ithalat sonrası anahtardan kullanışsız parçaları kaldırır"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr "ithalat sonrası anahtardan mümkün olduğunca çok şey kaldırır"
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "%d türündeki blok atlanıyor\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, c-format
msgid "%lu keys processed so far\n"
msgstr "şu ana kadar %lu anahtar işlendi\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "İşlenmiş toplam miktar: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " yeni anahtarlar atlandı: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " yeni anahtarlar atlandı: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " kullanıcı kimliksiz: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " alınan: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " değişmedi: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " yeni kullanıcı kimliği: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " yeni yardımcı anahtarlar: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " yeni imzalar: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " yeni anahtar iptalleri: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " gizli anahtarlar okundu: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " gizli anahtarlar indirildi: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " gizli anahtarlar değişmedi: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " alınamadı: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " temizlenen imzalar: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " temizlenen kullanıcı kimlikleri: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3474,197 -2711,159 +3449,197 @@@ msgstr "
"UYARI: anahtar %s bu kullanıcı kimliklerde kullanışsız algoritmalar için "
"tercihler içeriyor:\n"
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": şifreleme algoritması %s için tercih edilir\n"
- #: g10/import.c:1042
++#: g10/import.c:1048
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": özet algoritması %s için tercih edilir\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
" \"%s\": sıkıştırma algoritması %s için tercih edilir\n"
"\n"
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "tercihlerinizi güncellemenizi ve\n"
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"olası algoritma uyuşmazlığı sorunlarından kaçınmak için bu anahtarı\n"
"tekrar dağıtmanızı şiddetle öneririz.\n"
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, c-format
msgid "key %s: no user ID\n"
msgstr "anahtar %s: kullanıcı kimliği yok\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "\"%s\" atlandı: %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1264
++#: g10/import.c:1343
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "anahtar %s: PKS yardımcı anahtar bozulması giderildi\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "anahtar %s: öz-imzalı olmayan kullanıcı kimliği \"%s\" kabul edildi\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "anahtar %s: geçerli kullanıcı kimliği yok\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "anahtar %s: genel anahtar yok: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "anahtar %s: yeni anahtar - atlandı\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "\"%s\" anahtarlığına yazarken hata oluştu: %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "anahtar %s: \"%s\" 1 yeni kullanıcı kimliği\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "anahtar %s: \"%s\" %d yeni imza\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "anahtar %s: \"%s\" %d kullanıcı kimliği temizlendi\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "anahtar %s: \"%s\" %d kullanıcı kimliği temizlendi\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "anahtar %s: \"%s\" değişmedi\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, c-format
msgid "key %s: secret key imported\n"
msgstr "anahtar %s: gizli anahtar alındı\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "atlandı: gizli anahtar zaten var\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "key %s: error sending to agent: %s\n"
msgstr "%s komutu gönderilirken hata: %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key %s: %s\n"
msgstr "gizli anahtar \"%s\" yok: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
msgid "importing secret keys not allowed\n"
msgstr "gizli anahtarı alımına izin verilmez\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
@@@ -3679,147 -2878,120 +3654,147 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"anahtar %s: genel anahtar değil - yürürlükten kaldırma sertifikası "
"uygulanamaz\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr ""
"anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "anahtar %s: imza için kullanıcı kimliği yok\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"anahtar %s: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
"desteklenmiyor\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "anahtar %s: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "anahtar %s: anahtarı garantilemek için yardımcı anahtar yok\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "anahtar %s: çok sayıda yardımcı anahtar bağlantısı silindi\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "anahtar %s: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "anahtar %s: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr ""
"anahtar %s: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "anahtar %s: yardımcı anahtar atlandı\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "anahtar %s: imza gönderilebilir değil (0x%02X sınıfı) - atlandı\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "anahtar %s: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"UYARI: anahtar %s yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
"anahtarı %s alınıyor\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"UYARI: anahtar %s yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
"anahtarı %s mevcut değil.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
@@@ -4169,8 -3279,6 +4144,8 @@@ msgstr "Bu anahtarı çok dikkatle sın
msgid "Really sign? (y/N) "
msgstr "Gerçekten imzalayacak mısınız? (e/H veya y/N) "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "imzalama başarısız: %s\n"
@@@ -4662,13 -3668,9 +4637,13 @@@ msgstr "
"Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, gerekli\n"
"doğrulukta olmayacağını lütfen gözönüne alınız.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
msgid "revoked"
msgstr "yürürlükten kaldırıldı"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "zamanaşımına uğradı"
@@@ -5643,13 -4467,11 +5618,13 @@@ msgstr " Anahtar parmakizi =
msgid " Card serial no. ="
msgstr " Kart seri no. ="
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "`%s' anahtar zinciri önbellekleniyor\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5657,14 -4479,12 +5632,14 @@@ msgid_plural "%lu keys cached so far (%
msgstr[0] "şimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
msgstr[1] "şimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5672,7 -4492,6 +5647,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 kötü imza\n"
msgstr[1] "1 kötü imza\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: anahtar zinciri oluşturuldu\n"
@@@ -5894,116 -4668,97 +5869,122 @@@ msgstr "
msgid "no signature found\n"
msgstr "hiç imza yok\n"
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, c-format
msgid "BAD signature from \"%s\""
msgstr "\"%s\" deki imza KÖTÜ"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, c-format
msgid "Expired signature from \"%s\""
msgstr "\"%s\" deki imza zamanaşımına uğramış"
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, c-format
msgid "Good signature from \"%s\""
msgstr "\"%s\" deki imza iyi"
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "imza doğrulama engellendi\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
msgid "can't handle this ambiguous signature data\n"
msgstr "bu belirsiz imza verisi elde edilemiyor\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, c-format
msgid "Signature made %s\n"
msgstr "İmza %s de\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, c-format
msgid " using %s key %s\n"
msgstr " %s kullanılarak anahtar %s ile yapılmış\n"
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "%s imzası, %s anahtarı ve %s kullanıcı kimliği ile yapılmış\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ #| msgid " aka \"%s\""
+ msgid " issuer \"%s\"\n"
+ msgstr " nam-ı diğer \"%s\""
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "Anahtar burada:"
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[şüpheli]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, c-format
msgid " aka \"%s\""
msgstr " nam-ı diğer \"%s\""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "Bu imzanın geçerliliği %s de bitti.\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s imzası, %s özet algoritması\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "ikili"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "metinkipi"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "bilinmeyen"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algoritma: %s"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "İmza kontrol edilemedi: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "bir bağımsız imza değil\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "0x%02x sınıfı tek başına imza\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "eski stil (PGP 2.x) imza\n"
@@@ -6191,95 -4911,51 +6172,62 @@@ msgstr "UYARI: simetrik şifreli oturu
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, c-format
msgid "problem with the agent: %s\n"
msgstr "aracı ile sorun var: %s\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, c-format
- msgid " (main key ID %s)"
- msgstr " (asıl anahtar kimliği %s)"
-
- #: g10/passphrase.c:277
- #, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "OpenPGP sertifikası için gizli anahtarı açacak anahtar parolasını giriniz:\n"
- "\"%.*s\"\n"
- "%u bitlik %s anahtarı, kimlik %s,\n"
- "oluşturma tarihi %s%s.\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Anahtar parolasını giriniz\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "kullanıcı tarafından durduruldu\n"
- #: g10/passphrase.c:483
- #, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n"
- "Anahtarın sahibi: \"%s\"\n"
-
- #: g10/passphrase.c:491
- #, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%u bitlik %s anahtarı, %s kimliği ile %s tarihinde üretilmiş"
-
- #: g10/passphrase.c:500
++#: g10/passphrase.c:489
#, c-format
- msgid " (subkey on main key ID %s)"
- msgstr " (asıl anahtar kimliği %s üzerinde yardımcı anahtar)"
+ msgid " (main key ID %s)"
+ msgstr " (asıl anahtar kimliği %s)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
#, fuzzy
#| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr ""
"PKCS#12 nesnesinin korumasını aşmak için lütfen anahtar parolasını giriniz."
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, fuzzy, c-format
#| msgid "%u-bit %s key, ID %s, created %s"
msgid ""
@@@ -6480,131 -5121,104 +6428,131 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "UYARI: Güven derecesiz anahtar kullanılıyor!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr ""
"UYARI: bu anahtar yürürlükten kaldırılmamış olabilir (yürürlükten kaldırma "
"anahtarı mevcut değil)\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "UYARI: Bu anahtar onu üreten tarafından yürürlükten kaldırılmıştı!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
msgid " This could mean that the signature is forged.\n"
msgstr " Bu imza sahte anlamına gelebilir.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr ""
"UYARI: Bu yardımcı anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Bilgi: Bu anahtar iptal edildi.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, fuzzy, c-format
#| msgid "Note: Verified signer's address is `%s'\n"
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Bilgi: Doğrulanmış imzacının adresi: `%s'\n"
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, fuzzy, c-format
#| msgid "Note: Signer's address `%s' does not match DNS entry\n"
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "Bilgi: İmzacının adresi `%s', DNS girdisiyle eşleşmiyor\n"
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "geçerli PKA bilgisinden dolayı güvence seviyesi TAM olarak ayarlandı\n"
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "kötü PKA bilgisinden dolayı güvence seviyesi ASLA olarak ayarlandı\n"
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Bilgi: Bu anahtarın kullanım süresi dolmuştu!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "UYARI: Bu anahtar güven dereceli bir imza ile sertifikalanmamış!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Bu imzanın sahibine ait olduğuna dair bir belirti yok.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "UYARI: Bu anahtara güven-mi-yoruz!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " Bu imza SAHTE olabilir.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"UYARI: Bu anahtar yeterli güven derecesine sahip imzalarla "
"sertifikalanmamış!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
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:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: atlandı: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: atlandı: genel anahtar iptal edildi\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: atlandı: genel anahtar zaten var\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, 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:991
++#: g10/pkclist.c:995
#, 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:1094
++#: g10/pkclist.c:1098
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:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr "Şimdiki alıcılar:\n"
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6612,37 -5226,29 +6560,37 @@@ msgstr "
"\n"
"Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Böyle bir kullanıcı kimliği yok.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
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:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "Genel anahtar iptal edildi.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "öntanımlı alıcı \"%s\" bilinmiyor\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "geçerli adresler yok\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, 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:1649
++#: g10/pkclist.c:1653
#, 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"
@@@ -6933,7 -5487,6 +6881,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "genel anahtar %s imzadan %lu saniye daha yeni\n"
msgstr[1] "genel anahtar %s imzadan %lu saniye daha yeni\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -7013,12 -5557,10 +6961,12 @@@ msgstr "
"UYARI: tercih edilen anahtar sunucu adresi için %%lik uzatma imkansız\n"
"(çok büyük). Uzatılmadan kullanılıyor.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s imza: \"%s\" den\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -7026,11 -5568,9 +6974,11 @@@ msgstr "
"UYARI: alıcının tercihleriyle çelişen %s (%d) özet algoritması kullanılmak "
"isteniyor\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "imzalanıyor:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s şifrelemesi kullanılmayacak\n"
@@@ -7136,7 -5656,6 +7084,7 @@@ msgstr "güvence veritabanı işlemi ç
msgid "%s: directory does not exist!\n"
msgstr "%s: dizin yok!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7249,134 -5746,104 +7197,126 @@@ msgstr "%d karakterden daha uzun metin
msgid "input line longer than %d characters\n"
msgstr "girdi satırı %d karakterden daha uzun\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "standart seçenekler gönderilirken hata: %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "desteklenmeyen algoritma: %s"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "%s komutu gönderilirken hata: %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "`%s' gizli anahtarlığa yazılırken hata oluştu: %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: dizin kaydını yazma hatası: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "'%s' açılırken hata: %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "%s komutu gönderilirken hata: %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "yeni PIN alınırken hata: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "geçerliliği: %s"
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "saklanmış bayraklar alınırken hata: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "anahtarları listeler"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%ld message signed"
@@@ -7384,21 -5851,18 +7324,21 @@@ msgid_plural "%ld messages signed
msgstr[0] "ileti özetlerini gösterir"
msgstr[1] "ileti özetlerini gösterir"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7408,28 -5872,23 +7348,28 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
#| msgid "error storing flags: %s\n"
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "bayraklar saklanırken hata: %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
@@@ -7437,67 -5896,57 +7377,67 @@@ msgstr "boru oluşturulurken hata: %s\n
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %ld messages signed by \"%s\"."
msgstr "ileti özetlerini gösterir"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7508,20 -5957,16 +7448,20 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7538,8 -5983,6 +7478,7 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error opening TOFU database: %s\n"
@@@ -8095,7 -6429,6 +8034,7 @@@ msgstr "|N|İlk Yeni PIN
msgid "run in multi server mode (foreground)"
msgstr "çoklu sunucu kipinde çalışır (önalanda)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
@@@ -8156,7 -6478,6 +8095,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:785
#, fuzzy
#| msgid ""
#| "please use the option `--daemon' to run the program in the background\n"
@@@ -8165,12 -6486,10 +8104,12 @@@ msgstr "
"Programı artalanda çalışır bırakmak için lütfen `--daemon' seçeneğini "
"kullanın\n"
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr "fd %d için eylemci başlatıldı\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "fd %d için eylemci sonlandı\n"
@@@ -8274,12 -6570,10 +8213,12 @@@ msgstr "\"dirmngr\"'ın düzgün olara
msgid "checking the CRL failed: %s"
msgstr "CRL sınaması başarısız: %s"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr "geçersiz doğrulukla sertifika: %s"
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr "sertifika henüz geçersiz"
@@@ -8291,7 -6583,6 +8230,7 @@@ msgstr "kök sertifika henüz geçersiz
msgid "intermediate certificate not yet valid"
msgstr "ara sertifika henüz geçersiz"
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
msgid "certificate has expired"
msgstr "sertifika kullanım süresi dolmuş"
@@@ -8340,7 -6620,6 +8279,7 @@@ msgstr " (sertifika geçerlilik başla
msgid " ( issuer valid from "
msgstr " (sertifikacı geçerlilik başlangıcı: "
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, c-format
msgid "fingerprint=%s\n"
msgstr "parmakizi=%s\n"
@@@ -8370,7 -6643,6 +8309,7 @@@ msgstr "sertifikacı kim belli değil
msgid "self-signed certificate has a BAD signature"
msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr "kök sertifika güvenilir olarak imli değil"
@@@ -8379,28 -6650,22 +8318,28 @@@
msgid "checking the trust list failed: %s\n"
msgstr "güvence listesinin sınanması başarısız: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr "sertifika zinciri çok uzun\n"
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr "sertifikacı belli değil"
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
msgid "certificate has a BAD signature"
msgstr "sertifika KÖTÜ bir imzaya sahip"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr "başka bir eşleşmesi olası CA sertifikası var - tekrar deneniyor"
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr "sertifika zinciri CA tarafından izin verilenden uzun (%d)"
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
msgid "certificate is good\n"
msgstr "sertifika iyi durumda\n"
@@@ -8430,7 -6689,6 +8369,7 @@@ msgstr "%u bitlik çittirim %u bitlik %
msgid "(this is the MD2 algorithm)\n"
msgstr "(bu, MD2 algoritmasıdır)\n"
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
msgid "none"
msgstr "yok"
@@@ -8465,44 -6718,36 +8404,44 @@@ msgstr "
"S/N: %s, Kimlik: 0x%08lX,\n"
"oluşturuluşu: %s, süre bitimi: %s.\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr "hiç anahtar kullanımı belirtilmemiş - tüm kullanımlar var sayılıyor\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "anahtar kullanım bilgisi alınırken hata: %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
#, fuzzy
#| msgid "certificate should have not been used for certification\n"
msgid "certificate should not have been used for certification\n"
msgstr "sertifika onaylama için kullanılmamalıydı\n"
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
#, fuzzy
#| msgid "certificate should have not been used for OCSP response signing\n"
msgid "certificate should not have been used for OCSP response signing\n"
msgstr "sertifika, OCSP yanıtının imzalanması için kullanılmamalıydı\n"
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
#, fuzzy
#| msgid "certificate should have not been used for encryption\n"
msgid "certificate should not have been used for encryption\n"
msgstr "sertifika şifreleme için kullanılmamalıydı\n"
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
#, fuzzy
#| msgid "certificate should have not been used for signing\n"
msgid "certificate should not have been used for signing\n"
msgstr "sertifika imzalama için kullanılmamalıydı\n"
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr "sertifika şifreleme için elverişli değil\n"
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr "sertifika imzalama için elverişli değil\n"
@@@ -8958,23 -7113,19 +8897,23 @@@ msgstr "%s:%u: kullanıcısız parola v
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: bu satır atlanıyor\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
msgid "could not parse keyserver\n"
msgstr "anahtar sunucusu çözümlenemedi\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, 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:1673
++#: sm/gpgsm.c:1670
#, 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:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr "geçersiz komut (hiç dolaylı komut yok)\n"
@@@ -9035,7 -7174,6 +8974,7 @@@ msgstr "sertifika yeniden aranırken so
msgid "error storing flags: %s\n"
msgstr "bayraklar saklanırken hata: %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr "Hata - "
@@@ -9164,112 -7281,87 +9103,106 @@@ msgstr "mevcut sertifika aranırken sor
msgid "dropping %u certificates from the cache\n"
msgstr "Dirmngr önbelleğinde sertifikacıyı arar\n"
- #: dirmngr/certcache.c:352
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
- msgid "can't access directory '%s': %s\n"
- msgstr "`%s' dizini oluşturulamıyor: %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't parse certificate '%s': %s\n"
msgstr "\"%s\" oluşturulamıyor: %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, fuzzy, c-format
#| msgid "certificate `%s' deleted\n"
msgid "certificate '%s' already cached\n"
msgstr "sertifika `%s' silindi\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, fuzzy, c-format
#| msgid "duplicated certificate `%s' deleted\n"
msgid "trusted certificate '%s' loaded\n"
msgstr "yinelenmiş sertifika `%s' silindi\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, fuzzy, c-format
#| msgid "certificate `%s' deleted\n"
msgid "certificate '%s' loaded\n"
msgstr "sertifika `%s' silindi\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, fuzzy, c-format
#| msgid "fingerprint=%s\n"
msgid " SHA1 fingerprint = %s\n"
msgstr "parmakizi=%s\n"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error loading certificate '%s': %s\n"
msgstr "serifika saklanırken hata: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, fuzzy, c-format
#| msgid "Included certificates"
msgid "permanently loaded certificates: %u\n"
msgstr "İçerilen sertifikalar"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, fuzzy, c-format
#| msgid "number of matching certificates: %d\n"
msgid " runtime cached certificates: %u\n"
msgstr "eşleşen sertifika sayısı: %d\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
#, fuzzy
#| msgid " (certificate created at "
msgid "certificate already cached\n"
msgstr " ( sertifikanın oluşturuluşu: "
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate cached\n"
msgstr "sertifika iyi durumda\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error caching certificate: %s\n"
msgstr "serifika saklanırken hata: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "parmakizi geçersiz"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error fetching certificate by S/N: %s\n"
msgstr "serifika saklanırken hata: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error fetching certificate by subject: %s\n"
msgstr "serifika saklanırken hata: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
#, fuzzy
#| msgid "no issuer found in certificate"
msgid "no issuer found in certificate\n"
msgstr "sertifikacı kim belli değil"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error getting authorityKeyIdentifier: %s\n"
@@@ -9556,7 -7597,6 +9489,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "saklanmış bayraklar alınırken hata: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
@@@ -9577,7 -7614,6 +9510,7 @@@ msgstr "
msgid "converting S-expression failed: %s\n"
msgstr "iconv_open başarısız: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, fuzzy, c-format
#| msgid "receiving line failed: %s\n"
msgid "creating S-expression failed: %s\n"
@@@ -10012,128 -7968,95 +9945,122 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:159
- #, fuzzy
- #| msgid "run in daemon mode (background)"
- msgid "run as windows service (background)"
- msgstr "artalan süreci olarak çalışır"
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
#, 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:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "dirmngr'a bir komut aktarır"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
#, 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:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "PKA aramalarına izin verilir (DNS istekleri)"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
#, fuzzy
#| msgid "|FILE|read options from FILE"
msgid "|FILE|read LDAP server list from FILE"
msgstr "|DOSYA|seçenekler DOSYAdan okunur"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 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:209
++#: dirmngr/dirmngr.c:196
#, 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:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10146,13 -8069,11 +10073,13 @@@ msgstr "
"@\n"
"(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10164,88 -8085,71 +10091,88 @@@ msgstr "
"Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
"GnuPG için gizli anahtar yönetimi\n"
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, fuzzy, c-format
#| msgid "invalid debug-level `%s' given\n"
msgid "valid debug levels are: %s\n"
msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "kullanımı: gpgsm [seçenekler] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
#, 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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, 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:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, 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:1594
++#: dirmngr/dirmngr.c:1418
#, 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:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "parmakizi geçersiz"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, 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:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "zorlanmadı"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10618,115 -8452,94 +10545,115 @@@ msgstr "güvence listesinin sınanmas�
msgid "not signed by a default OCSP signer's certificate"
msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, fuzzy, c-format
#| msgid "receiving line failed: %s\n"
msgid "allocating list item failed: %s\n"
msgstr "satır alımı başarısız: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error getting responder ID: %s\n"
msgstr "yeni PIN alınırken hata: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
#, fuzzy
#| msgid "certificate should have not been used for OCSP response signing\n"
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr "sertifika, OCSP yanıtının imzalanması için kullanılmamalıydı\n"
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, fuzzy, c-format
#| msgid "issuer certificate not found"
msgid "issuer certificate not found: %s\n"
msgstr "sertifikacı belli değil"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
#, fuzzy
#| msgid "error reading list of trusted root certificates\n"
msgid "caller did not return the target certificate\n"
msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
#, fuzzy
#| msgid "error storing certificate\n"
msgid "caller did not return the issuing certificate\n"
msgstr "sertifika saklanırken hata\n"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, fuzzy, c-format
#| msgid "failed to allocate keyDB handle\n"
msgid "failed to allocate OCSP context: %s\n"
msgstr "anahtar veritabanı eylemcisine yer ayrılması başarısız oldu\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't get authorityInfoAccess: %s\n"
msgstr "'%s' erişilemiyor: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
#, fuzzy
#| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, fuzzy, c-format
#| msgid "using default PIN as %s\n"
msgid "using default OCSP responder '%s'\n"
msgstr "%s olarak öntanımlı PIN kullanılıyor\n"
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, fuzzy, c-format
#| msgid "using cipher %s\n"
msgid "using OCSP responder '%s'\n"
msgstr "%s şifrelemesi kullanılıyor\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "serifika saklanırken hata: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, fuzzy, c-format
#| msgid "certificate has been revoked"
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "sertifika yürürlükten kaldırılmıştı"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr ""
@@@ -10780,36 -8583,30 +10707,36 @@@ msgstr "select başarısız: %s\n
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, 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:2415
++#: dirmngr/server.c:2377
#, 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:2436
++#: dirmngr/server.c:2398
#, 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:2444
++#: dirmngr/server.c:2406
#, 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:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10837,39 -8630,29 +10764,35 @@@ msgstr "
msgid "checking CRL for"
msgstr "CRL sınaması başarısız: %s"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
#, fuzzy
#| msgid "self-signed certificate has a BAD signature"
msgid "selfsigned certificate has a BAD signature"
msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, fuzzy, c-format
#| msgid "checking for qualified certificate failed: %s\n"
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "nitelikli sertifika için sınama başarısız: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate chain is good\n"
msgstr "sertifika iyi durumda\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr ""
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
#, fuzzy
#| msgid "certificate should have not been used for signing\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:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
msgid "quiet"
msgstr "sessiz"
@@@ -11006,11 -8758,9 +10929,11 @@@ msgstr "|N|azami SSH anahtarı ömrü
msgid "Options enforcing a passphrase policy"
msgstr "Bir anahtar parolası kuralını zorlayan seçenekler"
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr "anahtar parolası kuralının atlanmasına izin verilmez"
+#: tools/gpgconf-comp.c:567
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"
@@@ -11154,77 -8872,61 +11077,77 @@@ msgstr "%s bileşeninin harici doğrula
msgid "Note that group specifications are ignored\n"
msgstr "Grup belirtimlerinin yoksayıldığına dikkat edin\n"
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr "tüm bileşenleri listeler"
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr "tüm programları sınar"
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr "|BİLEŞEN|seçenekleri listeler"
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr "|BİLEŞEN|seçenekleri değiştirir"
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr "|BİLEŞEN|seçenekleri sınar"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr "öntanımlı küresel değerleri uygular"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
#, 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:78
++#: tools/gpgconf.c:79
msgid "list global configuration file"
msgstr "küresel yapılandırma dosyasını listeler"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
msgid "check global configuration file"
msgstr "küresel yapılandırma dosayasını sınar"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
#, fuzzy
#| msgid "list all components"
msgid "reload all or a given component"
msgstr "tüm bileşenleri listeler"
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
#, fuzzy
#| msgid "list all components"
msgid "launch a given component"
msgstr "tüm bileşenleri listeler"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
#, fuzzy
#| msgid "list all components"
msgid "kill a given component"
msgstr "tüm bileşenleri listeler"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "çıktı dosyası olarak kullanılır"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
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:116
++#: tools/gpgconf.c:118
#, 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:119
++#: tools/gpgconf.c:121
#, fuzzy
#| msgid ""
#| "Syntax: gpgconf [options]\n"
@@@ -11236,15 -8938,12 +11159,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:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr "Tek bileşenlik değiştirge gerekli"
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
msgid "Component not found"
msgstr "Bileşen yok"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
msgid "No argument allowed"
msgstr "Değiştirgeye izin verilmez"
@@@ -11296,123 -8986,98 +11219,123 @@@ msgstr "
"[seçenekler...] KOMUT [girdi-dosyası]\n"
"Basit bir simetrik şifreleme aracı çalıştırır\n"
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%2$s üzerindeki %1$s %3$i durumuyla çıktı\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, c-format
msgid "%s on %s failed with status %i\n"
msgstr "%2$s üzerindeki %1$s %3$i durumuyla başarısız oldu\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, fuzzy, c-format
#| msgid "can't create temporary directory `%s': %s\n"
msgid "can't create temporary directory '%s': %s\n"
msgstr "`%s' geçici dizini oluşturulamıyor: %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr "%s yazmak için açılamadı: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, c-format
msgid "error writing to %s: %s\n"
msgstr "%s yazılırken hata: %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, c-format
msgid "error reading from %s: %s\n"
msgstr "%s okunurken hata: %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, c-format
msgid "error closing %s: %s\n"
msgstr "%s kapanırken hata: %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
msgid "no --program option provided\n"
msgstr "--program diye bir seçenek yok\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr "sadece --decrypt ve --encrypt destekleniyor\n"
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr "--keyfile diye bir seçenek yok\n"
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr "argüman dizgeleri dizisi ayrılamıyor\n"
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, c-format
msgid "could not create pipe: %s\n"
msgstr "boru oluşturulamadı: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, c-format
msgid "could not create pty: %s\n"
msgstr "pty oluşturulamadı: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr "çatallanamadı: %s\n"
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, c-format
msgid "execv failed: %s\n"
msgstr "execv başarısız: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, c-format
msgid "select failed: %s\n"
msgstr "select başarısız: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, c-format
msgid "read failed: %s\n"
msgstr "read başarısız: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, c-format
msgid "pty read failed: %s\n"
msgstr "pty okuması başarısız: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, c-format
msgid "waitpid failed: %s\n"
msgstr "waitpid başarısız: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr "alt süreç %i durumu ile çıktı\n"
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "dosya içi dizge ayrılamıyor: %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "dosya dışı dizge ayrılamıyor: %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr "ya %s verilmeli ya da %s\n"
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr "hiç sınıf sağlanmamış\n"
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, c-format
msgid "class %s is not supported\n"
msgstr "%s sınıfı desteklenmiyor\n"
diff --cc po/uk.po
index 907a41b,864fa1c..f0552cd
--- a/po/uk.po
+++ b/po/uk.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
msgstr ""
"Project-Id-Version: GNU gnupg 2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2016-07-10 15:11+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk at kde.org>\n"
@@@ -104,13 -88,9 +104,13 @@@ msgstr "
msgid "PIN:"
msgstr "Пінкод:"
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
msgid "Passphrase:"
msgstr "Пароль:"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr "паролі не збігаються, повторіть спробу"
@@@ -150,65 -122,43 +150,65 @@@ msgstr "Помилковий пінко
msgid "Bad Passphrase"
msgstr "Помилковий пароль"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr ""
"підтримки ключів ssh, що складаються з понад %d бітів, не передбачено\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, c-format
msgid "can't create '%s': %s\n"
msgstr "не вдалося створити «%s»: %s\n"
- #: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, c-format
msgid "can't open '%s': %s\n"
msgstr "не вдалося відкрити «%s»: %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "помилка під час спроби отримання серійного номера картки: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "виявлено картку з серійним номером: %s\n"
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "на карті немає ключа розпізнавання для SSH: %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "не виявлено відповідних ключів картки: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, c-format
msgid "shadowing the key failed: %s\n"
msgstr "помилка під час спроби хешування ключа: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, c-format
msgid "error writing key: %s\n"
msgstr "помилка під час спроби запису ключа: %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -217,24 -167,19 +217,24 @@@ msgstr "
"Процесом ssh надіслано запит щодо використання ключа%%0A %s%%0A "
"(%s)%%0AНадати доступ до цього ключа?"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr "Надати"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr "Заборонити"
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Будь ласка, вкажіть пароль до ключа ssh%%0A %F%%0A (%c)"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Будь ласка, повторіть введення пароля"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -243,7 -188,6 +243,7 @@@ msgstr "
"Будь ласка, вкажіть пароль для захисту отриманого закритого ключа%%0A %s"
"%%0A %s%%0Aу сховищі ключів gpg-agent"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "не вдалося створити потік даних з сокета: %s\n"
@@@ -378,8 -296,6 +378,8 @@@ msgstr "Вкажіть пароль д�
msgid "Please enter the new passphrase"
msgstr "Вкажіть новий пароль"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -387,128 -303,90 +387,128 @@@ msgstr "
"@Параметри:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr "запустити у режимі фонової служби (фоновий)"
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr "запустити у режимі сервера (основному)"
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "докладний режим"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "дещо зменшити кількість повідомлень"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr "виведення команд у форматі sh"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr "виведення команд у форматі csh"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FILE|прочитати параметри з вказаного файла"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr "не від’єднувати від консолі"
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr "не захоплювати керування клавіатурою і мишею"
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "використовувати файл журналу для сервера"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|використовувати вказану програму пінзаписів"
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|використовувати вказану програму SCdaemon"
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
msgid "do not use the SCdaemon"
msgstr "не використовувати SCdaemon"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|приймати певні команди через NAME"
- #: agent/gpg-agent.c:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr "ігнорувати запити щодо зміни TTY"
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr "ігнорувати запити щодо зміни графічного дисплея"
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|вважати кешовані пінкоди за вказану кількість секунд"
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr "не використовувати кеш пін-кодів для підписування"
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
msgid "disallow the use of an external password cache"
msgstr "заборонити використання зовнішнього кешу паролів"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr "заборонити клієнтам позначати ключі як надійні"
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
msgid "allow presetting passphrase"
msgstr "дозволити попереднє встановлення пароля"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr "заборонити функції виклику перевизначати pinentry"
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr "дозволити запит пароля з Emacs"
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
msgid "enable ssh support"
msgstr "увімкнути підтримку ssh"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Будь ласка, надсилайте повідомлення про помилки на <@EMAIL@>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Використання: @GPG_AGENT@ [параметри] (-h — довідка)"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -516,107 -394,72 +516,99 @@@ msgstr "
"Синтаксис: @GPG_AGENT@ [параметри] [команда [аргументи]]\n"
"Керування закритими ключами у @GNUPG@\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "вказано некоректне значення рівня діагностики «%s»\n"
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr "%s є занадто застарілою (потрібно %s, маємо %s)\n"
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "ЗАУВАЖЕННЯ: не виявлено файла типових параметрів «%s»\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, c-format
msgid "option file '%s': %s\n"
msgstr "файл параметрів «%s»: %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, c-format
msgid "reading options from '%s'\n"
msgstr "прочитати параметри з «%s»\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, c-format
msgid "can't create socket: %s\n"
msgstr "не вдалося створити сокет: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "назва сокета «%s» є надто довгою\n"
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent вже запущено, потреби у запуску нової копії немає\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
msgid "error getting nonce for the socket\n"
msgstr "помилка під час спроби отримання поточного стану сокета\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "помилка під час спроби прив’язування сокета до «%s»: %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "не вдалося встановити права доступу до «%s»: %s\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, c-format
msgid "listen() failed: %s\n"
msgstr "помилка listen(): %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, c-format
msgid "listening on socket '%s'\n"
msgstr "очікування даних на сокеті «%s»\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "не вдалося створити каталог «%s»: %s\n"
- #: agent/gpg-agent.c:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "створено каталог «%s»\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "помилка stat() щодо «%s»: %s\n"
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "не можна використовувати як домашній каталог «%s»\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr ""
@@@ -633,28 -474,22 +625,28 @@@ msgstr "запущено обробк�
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "обробник 0x%lx дескриптора файла %d завершив роботу\n"
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "запущено обробник ssh 0x%lx для дескриптора файла %d\n"
- #: agent/gpg-agent.c:2390
++#: agent/gpg-agent.c:2392
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "обробник ssh 0x%lx дескриптора файла %d завершив роботу\n"
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "помилка pth_select: %s — очікування у 1 с\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s зупинено\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "у цьому сеансі не запущено gpg-agent\n"
@@@ -671,8 -504,6 +663,8 @@@ msgstr "
"Синтаксис: gpg-preset-passphrase [параметри] KEYGRIP\n"
"Керування кешем паролів\n"
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -680,9 -511,6 +672,9 @@@ msgstr "
"@Команди:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -704,22 -530,18 +696,22 @@@ msgstr "
"Синтаксис: gpg-protect-tool [параметри] [аргументи]\n"
"Інструмент керування закритими ключами\n"
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Будь ласка, вкажіть пароль для зняття захисту з об’єкта PKCS#12."
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Будь ласка, вкажіть пароль для захисту нового об’єкта PKCS#12."
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
"Будь ласка, введіть пароль для захисту імпортованого об’єкта у системі GnuPG."
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -727,16 -549,13 +719,16 @@@ msgstr "
"Будь ласка, вкажіть пароль або пінкод,\n"
"потрібні для завершення цієї дії."
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
msgid "cancelled\n"
msgstr "скасовано\n"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "помилка під час спроби запиту пароля: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, c-format
msgid "error opening '%s': %s\n"
msgstr "помилка під час відкриття «%s»: %s\n"
@@@ -912,43 -702,31 +904,43 @@@ msgstr "підтримки алгори
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "підтримки алгоритму захисту хешуванням %d (%s) не передбачено\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "помилка під час спроби створення каналу: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "помилка під час спроби створення потоку для каналу: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, c-format
msgid "error forking process: %s\n"
msgstr "помилка під час спроби розгалужування процесу: %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "не вдалося дочекатися переривання процесу: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr ""
"помилка під час спроби виконання «%s»: ймовірно, програму не встановлено\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "помилка під час спроби виконання «%s»: стан виходу %d\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, c-format
msgid "error running '%s': terminated\n"
msgstr "помилка під час спроби виконання «%s»: виконання перервано\n"
@@@ -963,33 -739,13 +955,16 @@@ msgstr "помилка під час с
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "не вдалося дочекатися завершення процесу %d: %s\n"
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "не вдалося встановити з’єднання з «%s»: %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "проблема під час спроби обміну даними з gpg-agent\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
msgid "problem setting the gpg-agent options\n"
msgstr "проблема під час спроби встановлення параметрів gpg-agent\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- msgid "canceled by user\n"
- msgstr "скасовано користувачем\n"
-
- #: common/simple-pwquery.c:579
- msgid "problem with the agent\n"
- msgstr "проблема з агентом\n"
-
- #: common/simple-pwquery.c:701
- #, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "проблема із агентом (неочікувана відповідь «%s»)\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "не вдалося вимкнути створення дампів образів у пам’яті: %s\n"
@@@ -1075,7 -814,6 +1050,7 @@@ msgstr "%s:%u: застарілий п�
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "УВАГА: «%s%s» є застарілим параметром — він не працюватиме\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr "невідомий прапорець діагностики «%s» проігноровано\n"
@@@ -1098,17 -832,14 +1073,17 @@@ msgstr "встановлено з’є�
msgid "connection to agent is in restricted mode\n"
msgstr "з’єднання з агентом відбувається у обмеженому режимі\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr "Dirmngr не запущено — запускаємо «%s»\n"
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "очікування на працездатність dirmngr… (%d с)\n"
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr "встановлено з’єднання з dirmngr\n"
@@@ -1366,7 -1037,6 +1341,7 @@@ msgstr "параметр «%.50s» є �
msgid "command \"%.50s\" is ambiguous\n"
msgstr "команда «%.50s» є неоднозначною\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
msgid "out of core\n"
msgstr "вихід за межі області пам’яті\n"
@@@ -1424,7 -1083,10 +1399,13 @@@ msgstr "блокування «%s» н�
msgid "waiting for lock %s...\n"
msgstr "очікування на блокування %s…\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr "%s є занадто застарілою (потрібно %s, маємо %s)\n"
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "формат ASCII: %s\n"
@@@ -1654,10 -1261,6 +1635,10 @@@ msgstr "Адреса для отрим�
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Помилка: адреса є занадто довгою (максимум — %d символів).\n"
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, c-format
msgid "error reading '%s': %s\n"
msgstr "помилка під час спроби читання «%s»: %s\n"
@@@ -1943,26 -1481,17 +1924,26 @@@ msgstr "Команди адмініст
msgid "Invalid command (try \"help\")\n"
msgstr "Некоректна команда (скористайтеся командою «help»)\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output не працює з цією командою\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "не вдалося відкрити «%s»\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "ключ «%s» не знайдено: %s\n"
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "помилка під час спроби читання блокування ключа: %s\n"
@@@ -2020,36 -1537,29 +2001,36 @@@ msgid "use option \"--delete-secret-key
msgstr ""
"спершу скористайтеся параметром «--delete-secret-keys» для його вилучення.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "помилка під час спроби створення пароля: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "не можна використовувати симетричний пакет ESK через режим S2K\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "використано шифр %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, c-format
msgid "'%s' already compressed\n"
msgstr "«%s» вже стиснено\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "УВАГА: файл «%s» є порожнім\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, c-format
msgid "reading from '%s'\n"
msgstr "читання з «%s»\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2057,7 -1567,6 +2038,7 @@@ msgstr "
"УВАГА: примусове використання симетричного шифру %s (%d) не відповідає "
"параметрам отримувача\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2066,19 -1575,16 +2047,19 @@@ msgstr "
"УВАГА: примусове використання алгоритму стиснення %s (%d) не відповідає "
"параметрам отримувача\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"примусове використання симетричного шифру %s (%d) не відповідає параметрам "
"отримувача\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s зашифровано для «%s»\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "не можна використовувати %s у режимі %s\n"
@@@ -2185,8 -1670,6 +2166,8 @@@ msgstr "вилучити максиму
msgid " - skipped"
msgstr " - пропущено"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, c-format
msgid "writing to '%s'\n"
msgstr "записуємо до «%s»\n"
@@@ -2219,8 -1695,6 +2200,8 @@@ msgstr "помилка створенн
msgid "[User ID not found]"
msgstr "[Ідентифікатор не знайдено]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(перевірте аргумент параметра «%s»)\n"
@@@ -2288,201 -1749,152 +2269,201 @@@ msgstr "
msgid "using subkey %s instead of primary key %s\n"
msgstr "використовуємо підключ %s замість основного ключа %s\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
msgid "make a signature"
msgstr "створити підпис"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
msgid "make a clear text signature"
msgstr "створити текстовий підпис"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "створити від’єднаний підпис"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "зашифрувати дані"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "шифрувати лише за допомогою симетричного шифру"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "розшифрувати дані (типова дія)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "перевірити підпис"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "показати список ключів"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "показати список ключів і підписів"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "list and check key signatures"
msgstr "показати список і перевірити підписи ключів"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "показати список ключів і відбитків"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "показати список закритих ключів"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "створити пару ключів"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
msgid "quickly generate a new key pair"
msgstr "швидке створення пари ключів"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
msgid "quickly add a new user-id"
msgstr "швидке додавання нового ідентифікатора користувача"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
msgid "quickly revoke a user-id"
msgstr "швидке відкликання ідентифікатора користувача"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr "повноцінне створення пари ключів"
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "створити сертифікат відкликання"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "вилучити ключі з відкритого сховища ключів"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "вилучити ключів з закритого сховища ключів"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
msgid "quickly sign a key"
msgstr "швидко підписати ключ"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
msgid "quickly sign a key locally"
msgstr "швидко підписати ключ локально"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "підписати ключ"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "підписати ключ локально"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "підписати або редагувати ключ"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "змінити пароль"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "експортувати ключі"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "експортувати ключі на сервер ключів"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "імпортувати ключі з сервера ключів"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "шукати ключі на сервері ключів"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "оновити всі ключів з сервера ключів"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "імпортувати/об’єднати ключі"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr "показати дані про стан картки"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr "змінити дані на картці"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr "змінити пінкод картки"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "оновити базу даних довіри"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
msgid "print message digests"
msgstr "показати контрольні суми повідомлень"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "запустити у режимі сервера"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|VALUE|встановити вказане правило TOFU для ключа"
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "створити дані у форматі ASCII"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|зашифрувати для вказаного ідентифікатора"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"|USER-ID|використовувати для створення підписів або розшифрування вказаний "
"ідентифікатор"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|встановити рівень стиснення (0 — вимкнути)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "використовувати канонічний текстовий режим"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FILE|записати дані до вказаного файла"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "не вносити змін"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "запитувати перед перезаписом"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr "строго використовувати стандарт OpenPGP"
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2491,7 -1903,6 +2472,7 @@@ msgstr "
"(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
"довідника (man))\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2512,11 -1923,9 +2493,11 @@@ msgstr "
" --list-keys [назви] показати ключі\n"
" --fingerprint [назви] показати відбитки\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Використання: @GPG@ [параметри] [файли] (-h — довідка)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2526,7 -1935,6 +2507,7 @@@ msgstr "
"Підписування, перевірка підписів, шифрування або розшифрування\n"
"Типова дія залежатиме від вхідних даних\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2534,76 -1942,61 +2515,76 @@@ msgstr "
"\n"
"Підтримувані алгоритми:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "Відкритий ключ: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Шифр: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "Хеш: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Стиснення: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "користування: %s [параметри] %s\n"
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "несумісні команди\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "у визначенні групи «%s» немає знаку «=»\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "УВАГА: визначення власника домашнього каталогу «%s» не є безпечним\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "УВАГА: визначення власника у файлі налаштувань «%s» не є безпечним\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "УВАГА: визначення власника додатка «%s» не є безпечним\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до домашнього каталогу «%s» не є безпечним\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до файла налаштувань «%s» не є безпечним\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "УВАГА: визначення прав доступу до додатка «%s» не є безпечним\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"УВАГА: визначення власника підлеглого каталогу домашнього каталогу «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2611,21 -2004,18 +2592,21 @@@ msgstr "
"УВАГА: визначення власника у підлеглому каталозі, визначеному файлом "
"налаштувань «%s», не є безпечним\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"УВАГА: визначення власника підлеглого каталогу у додатку «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до підлеглого каталогу домашнього каталогу "
"«%s» не є безпечним\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2633,515 -2023,400 +2614,511 @@@ msgstr "
"УВАГА: визначення прав доступу до підлеглого каталогу, визначеного файлом "
"налаштувань «%s», не є безпечним\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до підлеглого каталогу у додатку «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "невідомий пункт налаштувань «%s»\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr "показувати фотоідентифікатори у списках ключів"
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
msgid "show key usage information during key listings"
msgstr "показувати дані щодо використання ключа у списках ключів"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr "показувати адреси правил у списках підписів"
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
msgid "show all notations during signature listings"
msgstr "показувати всі примітки у списках підписів"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr "показувати стандартні примітки IETF у списках підписів"
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr "показувати примітки користувача у списках підписів"
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
msgid "show preferred keyserver URLs during signature listings"
msgstr "показувати адреси основних серверів ключів у списках підписів"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr "показувати чинність ідентифікаторів користувачів у списках ключів"
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr ""
"показувати відкликані та застарілі ідентифікатори користувачів у списках "
"ключів"
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr "показувати відкликані та застарілі підключі у списках ключів"
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
msgid "show the keyring name in key listings"
msgstr "показувати назву сховища ключів у списках ключів"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
msgid "show expiration dates during signature listings"
msgstr "показувати дати завершення строків дії у списку підписів"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
msgid "available TOFU policies:\n"
msgstr "можливі варіанти правил TOFU:\n"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "невідомі правила TOFU «%s»\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr "(команда «help» виводить список можливих варіантів)\n"
- #: g10/gpg.c:2041
- #, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "невідомий формат бази даних TOFU «%s»\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "ЗАУВАЖЕННЯ: застарілий файл типових параметрів «%s» проігноровано\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr "libgcrypt занадто стара (потрібна — %s, маємо %s)\n"
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "«%s» не є коректним записом завершення строку дії підпису\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ #| msgid "line %d: not a valid email address\n"
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "рядок %d: некоректна адреса електронної пошти\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "некоректний режим pinentry, «%s»\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "«%s» не є коректним набором символів\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "не вдалося обробити адресу сервера ключів\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: некоректні параметри сервера ключів\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
msgid "invalid keyserver options\n"
msgstr "некоректні параметри сервера ключів\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: некоректні параметри імпортування\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "некоректні параметри імпортування\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, c-format
msgid "invalid filter option: %s\n"
msgstr "некоректний параметр фільтрування: %s\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: некоректні параметри експортування\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "некоректні параметри експортування\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: некоректні параметри побудови списку\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
msgid "invalid list options\n"
msgstr "некоректні параметри побудови списку\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr "показувати фотоідентифікатори під час перевірки підписів"
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr "показувати адреси правил під час перевірки підписів"
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
msgid "show all notations during signature verification"
msgstr "показувати всі примітки під час перевірки підписів"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr "показувати стандартні примітки IETF під час перевірки підписів"
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr "показувати вказані користувачем примітки під час перевірки підписів"
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"показувати адреси основних серверів ключів у списках перевірки підписів"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
msgid "show user ID validity during signature verification"
msgstr ""
"показувати чинність ідентифікаторів користувача під час перевірки підписів"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"показувати відкликані та застарілі ідентифікатори користувачів у списках "
"перевірки підписів"
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
msgid "show only the primary user ID in signature verification"
msgstr ""
"показувати лише основний ідентифікатор користувача під час перевірки підписів"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr "перевірити підписи за допомогою даних PKA"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr "підняти рівень довіри до підписів з коректними даними PKA"
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: некоректні параметри перевірки\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
msgid "invalid verify options\n"
msgstr "некоректні параметри перевірки\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "не вдалося встановити шлях для запуску у значення %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: некоректний список auto-key-locate\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr "некоректний список auto-key-locate\n"
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "УВАГА: можливе створення дампу пам’яті програми!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "УВАГА: %s перевизначає %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s не можна використовувати разом з %s!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s є зайвим, якщо використано %s!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr "УВАГА: запущено з фіктивним системним часом: "
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "не буде запущено з помилками у захисті пам’яті через %s\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "вибраний алгоритм шифрування є некоректним\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "вибраний алгоритм побудови контрольних сум є некоректним\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
msgid "selected compression algorithm is invalid\n"
msgstr "вибраний алгоритм стискання є некоректним\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
"вибраний алгоритм створення контрольних сум для сертифікації є некоректним\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "значення completes-needed має бути більшим за 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "значення marginals-needed має перевищувати 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "значення max-cert-depth має перебувати у діапазоні від 1 до 255\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "некоректне значення default-cert-level; має бути 0, 1, 2 або 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "некоректне значення min-cert-level; має бути 1, 2 або 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr ""
"ЗАУВАЖЕННЯ: наполегливо не рекомендуємо вам користуватися простим режимом "
"S2K (0)\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "некоректний режим S2K; мало бути вказано 0, 1 або 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "некоректні типові параметри\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "некоректні особисті параметри шифрування\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "некоректні особисті параметри контрольної суми\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "некоректні особисті параметри стискання\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ще не може працювати разом з %s\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "не можна використовувати алгоритм шифрування «%s» у режимі %s\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr ""
"не можна використовувати алгоритм створення контрольних сум «%s» у режимі "
"%s\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "не можна використовувати алгоритм стискання «%s» у режимі %s\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "не вдалося ініціалізувати базу даних надійності (TrustDB): %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"УВАГА: отримувачів (-r) вказано без використання шифрування відкритим "
"ключем\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [назва файла]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [назва файла]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "помилка під час спроби симетричного шифрування «%s»: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [назва файла]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [назва файла]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --encrypt у режимі --s2k-"
"mode 0\n"
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --encrypt у режимі %s\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [назва файла]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [назва файла]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [назва файла]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --sign --encrypt у режимі --"
"s2k-mode 0\n"
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --sign --encrypt у режимі "
"%s\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [назва файла]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [назва файла]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [назва файла]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [команди]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
msgid "--passwd <user-id>"
msgstr "--passwd <ідентифікатор-користувача>"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "помилка під час надсилання даних на сервер ключів: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "помилка під час спроби отримання даних з сервера ключів: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "помилка під час спроби експортування ключа: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "спроба експортування ключа ssh зазнала невдачі: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "помилка пошуку на сервері ключів: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "помилка оновлення з сервера ключів: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "помилка перетворення з формату ASCII: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "помилка перетворення у формат ASCII: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "некоректний алгоритм хешування «%s»\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "помилка під час спроби обробки специфікації ключа «%s»: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr "«%s» не є коректним ідентифікатором ключа, відбитком або кодом\n"
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[назва файла]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "Почніть вводити ваше повідомлення...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "вказана адреса правил сертифікації є некоректною\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "вказана адреса правил підписування є некоректною\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
msgid "the given preferred keyserver URL is invalid\n"
msgstr "вказана адреса основного сервера ключів є некоректною\n"
@@@ -3182,133 -2449,105 +3159,133 @@@ msgstr "Довідки не перед�
msgid "No help available for '%s'"
msgstr "Довідки щодо %s не виявлено"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr "імпортувати підписи, позначені як лише локальні"
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr "відновлювати пошкодження сервером ключів pks під час імпортування"
- #: g10/import.c:140
++#: g10/import.c:144
msgid "do not clear the ownertrust values during import"
msgstr "не вилучати значень власної довіри під час імпортування"
- #: g10/import.c:143
++#: g10/import.c:147
msgid "do not update the trustdb after import"
msgstr "не оновлювати базу даних довіри після імпортування"
- #: g10/import.c:146
++#: g10/import.c:150
msgid "show key during import"
msgstr "показувати ключ під час імпортування"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr "приймати оновлення лише вже створених ключів"
- #: g10/import.c:152
++#: g10/import.c:156
msgid "remove unusable parts from key after import"
msgstr "вилучити невикористані частини ключа після імпортування"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr "вилучити максимум частин з ключа після імпортування"
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr "запустити фільтри імпортування та експортувати ключ негайно"
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "пропускаємо блок типу %d\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, c-format
msgid "%lu keys processed so far\n"
msgstr "оброблено %lu ключів\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Загалом оброблено: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " пропущено ключів PGP-2: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr "пропущено нових ключів: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " без ід. користувача: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " імпортовано: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " без змін: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr "нових ід. користувачів: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " нових підключів: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " нових підписів: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr "відкликань нових ключів: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr "прочитано закритих ключів: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "імпортовано закр. ключів: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " закр. ключів без змін: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " не імпортовано: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " вилучених підписів: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " вилучених ід. корист.: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3317,190 -2556,152 +3294,190 @@@ msgstr "
"УВАГА: у ключі %s містяться записи надання переваги\n"
"недоступним алгоритмам для таких ід. користувачів:\n"
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " «%s»: перевага алгоритму шифрування %s\n"
- #: g10/import.c:1042
++#: g10/import.c:1048
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " «%s»: перевага алгоритму контрольних сум %s\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " «%s»: перевага алгоритму стискання %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "наполегливо рекомендуємо вам оновити записи переваг і\n"
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"повторно поширити цей ключ, щоб уникнути потенційних проблем з алгоритмами\n"
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"оновити записи перевад можна за допомогою команди: gpg --edit-key %s updpref "
"save\n"
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, c-format
msgid "key %s: no user ID\n"
msgstr "ключ %s: немає ідентифікатор користувача\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, c-format
msgid "key %s: %s\n"
msgstr "ключ %s: %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr "відкинуто екранувальником імпорту"
- #: g10/import.c:1264
++#: g10/import.c:1343
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "ключ %s: відновлено пошкоджений підключ PKS\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "ключ %s: прийнято несамопідписаний ідентифікатор користувача «%s»\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "ключ %s: немає чинних ідентифікаторів користувача\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "причиною цього може бути те, що немає самопідпису\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "ключ %s: не знайдено відкритий ключ: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "ключ %s: новий ключ — пропущено\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "не виявлено придатного до запису сховища ключів: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "помилка під час спроби запису сховища ключів «%s»: %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "ключ %s: імпортовано відкритий ключ «%s»\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "ключ %s: не відповідає нашій копії\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "ключ %s: не вдалося знайти початковий блок ключів: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "ключ %s: не вдалося прочитати початковий блок ключів: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "ключ %s: «%s» 1 новий ідентифікатор користувача\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "ключ %s: «%s» %d нових ідентифікаторів користувачів\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "ключ %s: «%s» 1 новий підпис\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "ключ %s: «%s» %d нових підписів\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "ключ %s: «%s» 1 новий підключ\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "ключ %s: «%s» %d нових підключів\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "ключ %s: «%s» вилучено %d підпис\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "ключ %s: «%s» вилучено %d підписів\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "ключ %s: «%s» спорожнено %d ідентифікатор користувача\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "ключ %s: «%s» спорожнено %d ідентифікаторів користувачів\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "ключ %s: «%s» не змінено\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, c-format
msgid "key %s: secret key imported\n"
msgstr "ключ %s: імпортовано закритий ключ\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "ключ %s: закритий ключ вже існує\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "ключ %s: помилка під час спроби надсилання агенту: %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, c-format
msgid "secret key %s: %s\n"
msgstr "закритий ключ %s: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
msgid "importing secret keys not allowed\n"
msgstr "імпортування закритих ключів заборонено\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "ключ %s: закритий ключ з некоректним шифром %d — пропущено\n"
@@@ -3515,143 -2716,116 +3492,143 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
"Для перенесення «%s» на кожній із карток пам’яті слід виконати таку команду: "
"%s\n"
- #: g10/import.c:2133
++#: g10/import.c:2226
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"ключ %s: немає відкритого ключа — не можна застосовувати сертифікат "
"відкликання\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "ключ %s: некоректний сертифікат відкликання: %s — відкинуто\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "ключ %s: імпортовано сертифікат відкликання «%s»\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "ключ %s: немає ідентифікатор користувача для підпису\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"ключ %s: непідтримуваний алгоритм створення відкритого ключа для "
"ідентифікатора користувача «%s»\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "ключ %s: некоректний самопідпис для ідентифікатора користувача «%s»\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "ключ %s: непідтримуваний алгоритм створення відкритого ключа\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "ключ %s: некоректний безпосередній підпис ключа\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "ключ %s: немає підключа для зв’язування ключів\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "ключ %s: некоректне зв’язування підключів\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "ключ %s: вилучено кратне зв’язування підключів\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "ключ %s: немає підключа для відкликання ключа\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "ключ %s: некоректне відкликання підключа\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "ключ %s: вилучено кратне відкликання підключа\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "ключ %s: пропущено ідентифікатор користувача «%s»\n"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "ключ %s: пропущено підключ\n"
- #: g10/import.c:2516
++#: g10/import.c:2609
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "ключ %s: непридатний до експорту підпис (клас 0x%02X) — пропущено\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "ключ %s: сертифікат відкликання у помилковому місці — пропущено\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "ключ %s: некоректний сертифікат відкликання: %s — пропущено\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "ключ %s: підпис підключа у помилковому місці — пропущено\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "ключ %s: неочікуваний клас підпису (0x%02X) — пропущено\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "ключ %s: виявлено дублювання ідентифікаторів користувача — об’єднано\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "УВАГА: ключ %s могло бути відкликано: отримуємо ключ відкликання %s\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "УВАГА: ключ %s могло бути відкликано: ключа відкликання %s немає.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "ключ %s: додано сертифікат відкликання «%s»\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "ключ %s: додано безпосередній підпис ключа\n"
@@@ -3992,8 -3104,6 +3969,8 @@@ msgstr "Цей ключ ретельн�
msgid "Really sign? (y/N) "
msgstr "Підписати? (y/N або т/Н) "
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "помилка під час спроби підписування: %s\n"
@@@ -4449,13 -3457,9 +4426,13 @@@ msgstr "
"Зауважте, що показані дані щодо чинності ключів не обов’язково є коректними\n"
"до перезапуску програми.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
msgid "revoked"
msgstr "відкликано"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "збіг строк дії"
@@@ -5396,12 -4222,10 +5373,12 @@@ msgstr " Відбиток ключ
msgid " Card serial no. ="
msgstr "Серійний номер картки ="
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, c-format
msgid "caching keyring '%s'\n"
msgstr "кешування сховища ключів «%s»\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
@@@ -5409,7 -4233,6 +5386,7 @@@ msgstr[0] "зараз кешовано
msgstr[1] "зараз кешовано %lu ключів (%lu підписи)\n"
msgstr[2] "зараз кешовано %lu ключів (%lu підписів)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
@@@ -5417,7 -4240,6 +5394,7 @@@ msgstr[0] "кешовано %lu клю�
msgstr[1] "кешовано %lu ключі"
msgstr[2] "кешовано %lu ключів"
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, c-format
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
@@@ -5425,7 -4247,6 +5402,7 @@@ msgstr[0] " (%lu підпис)\n
msgstr[1] " (%lu підписи)\n"
msgstr[2] " (%lu підписів)\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: створено сховище ключів\n"
@@@ -5644,113 -4420,94 +5621,119 @@@ msgstr "
msgid "no signature found\n"
msgstr "підпису не знайдено\n"
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, c-format
msgid "BAD signature from \"%s\""
msgstr "ПОМИЛКОВИЙ підпис від «%s»"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Прострочений підпис від «%s»"
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, c-format
msgid "Good signature from \"%s\""
msgstr "Належний підпис від «%s»"
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "перевірку підписів придушено\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
msgid "can't handle this ambiguous signature data\n"
msgstr "не вдалося обробити ці дані з неоднозначним підписом\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, c-format
msgid "Signature made %s\n"
msgstr "Підпис створено %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, c-format
msgid " using %s key %s\n"
msgstr " за допомогою %s ключа %s\n"
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Підпис створено %s ключем %s з ідентифікатором %s\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ #| msgid " aka \"%s\""
+ msgid " issuer \"%s\"\n"
+ msgstr " або «%s»"
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "Ключ доступний на: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[непевний]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, c-format
msgid " aka \"%s\""
msgstr " або «%s»"
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "Строк дії підпису вичерпано %s\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "Підпис діє до %s\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s підпис, алгоритм контрольної суми %s%s%s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "двійковий"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "текстовий"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "невідомо"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
msgid ", key algorithm "
msgstr ", алгоритм ключа "
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr "УВАГА: не відє’днаний підпис; файл «%s» не було перевірено!\n"
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Не вдалося перевірити підпис: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "не є від’єднаним підписом\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "УВАГА: виявлено кратні підписи. Буде перевірено лише перший.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "окремий підпис класу 0x%02x\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "підпис у застарілому форматі (PGP 2.x)\n"
@@@ -5931,82 -4653,38 +5914,49 @@@ msgstr "
msgid "subpacket of type %d has critical bit set\n"
msgstr "підпакет типу %d містить критичний набір бітів\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, c-format
msgid "problem with the agent: %s\n"
msgstr "проблема з агентом: %s\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, c-format
- msgid " (main key ID %s)"
- msgstr " (ідентифікатор основного ключа %s)"
-
- #: g10/passphrase.c:277
- #, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "Вкажіть пароль для розблокування закритого ключа для сертифіката OpenPGP:\n"
- "«%.*s»\n"
- "%u-бітовий ключ %s, ідентифікатор %s,\n"
- "створено %s%s.\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "Вкажіть пароль\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "скасовано користувачем\n"
- #: g10/passphrase.c:483
- #, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "Вам потрібен пароль для розблокування закритого ключа\n"
- "для користувача: «%s»\n"
-
- #: g10/passphrase.c:491
++#: g10/passphrase.c:489
#, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%u-бітовий ключ %s, ідентифікатор %s, створено %s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr " (підключ у ідентифікаторі основного ключа %s)"
+ msgid " (main key ID %s)"
+ msgstr " (ідентифікатор основного ключа %s)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Вкажіть пароль для розблокування закритого ключа OpenPGP:"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Вкажіть пароль для імпортування закритого ключа OpenPGP:"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Вкажіть пароль для експортування закритого підключа OpenPGP:"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Вкажіть пароль для експортування закритого ключа OpenPGP:"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Справді хочете остаточно вилучити закритий підключ OpenPGP:"
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Справді хочете остаточно вилучити закритий ключ OpenPGP:"
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, c-format
msgid ""
"%s\n"
@@@ -6211,122 -4854,95 +6161,122 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "Попри все використовувати цей ключ? (y/N або т/Н) "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "УВАГА: використовуємо ненадійний ключ!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "УВАГА: цей ключ могло бути відкликано (немає ключа відкликання)\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "УВАГА: цей ключ було відкликано відповідною особою!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "УВАГА: цей ключ було відкликано власником!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
msgid " This could mean that the signature is forged.\n"
msgstr " Це може означати, що підпис було підроблено.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "УВАГА: цей підключ було відкликано його власником!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "Зауваження: цей ключ було вимкнено.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Зауваження: перевіреною адресою автора підпису є «%s»\n"
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "Зауваження: адреса автора підпису «%s» не збігається з записом DNS\n"
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "рівень довіри змінено на FULL (повна) через коректність даних PKA\n"
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "рівень довіри змінено на NEVER (ніколи) через помилки у даних PKA\n"
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "Зауваження: строк дії цього ключа вичерпано!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "УВАГА: цей ключ не сертифіковано за допомогою надійного підпису!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Немає підтверджень належності підпису його власнику.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "УВАГА: ми НЕ довіряємо цьому ключу!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " Підпис, ймовірно, є ПІДРОБКОЮ.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "УВАГА: цей ключ не сертифіковано достатньо надійними підписами!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Певності у належності підпису його власнику немає.\n"
- #: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: пропущено: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: пропущено: відкритий ключ вимкнено\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: пропущено: відкритий ключ вже існує\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, c-format
msgid "can't encrypt to '%s'\n"
msgstr "не вдалося зашифрувати до «%s»\n"
- #: g10/pkclist.c:984
++#: g10/pkclist.c:988
#, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "вказано параметр «%s», але не вказано коректних типових ключів\n"
- #: g10/pkclist.c:991
++#: g10/pkclist.c:995
#, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "вказано параметр «%s», але не вказано параметр «%s»\n"
- #: g10/pkclist.c:1094
++#: g10/pkclist.c:1098
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr ""
"Вами не вказано ідентифікатора користувача. (можете скористатися «-r»)\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr "Поточні отримувачі:\n"
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6334,37 -4950,29 +6284,37 @@@ msgstr "
"\n"
"Вкажіть ідентифікатор користувача. Дані слід завершити порожнім рядком: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "Немає такого ідентифікатора користувача.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
msgid "skipped: public key already set as default recipient\n"
msgstr "пропущено: відкритий ключ вже встановлено для типового отримувача\n"
- #: g10/pkclist.c:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "Відкритий ключ вимкнено.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "пропущено: відкритий ключ вже встановлено\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "невідомий типовий отримувач «%s»\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "немає коректних адрес\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Зауваження: у ключі %s не передбачено можливості %s\n"
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Зауваження: у ключі %s не передбачено переваг для %s\n"
@@@ -6656,7 -5212,6 +6606,7 @@@ msgstr[0] "відкритий ключ
msgstr[1] "відкритий ключ %s є на %lu дні новішим за підпис\n"
msgstr[2] "відкритий ключ %s є на %lu днів новішим за підпис\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6737,12 -5283,10 +6687,12 @@@ msgstr "
"УВАГА: не вдалося виконати %%-розгортання адреси основного сервера ключів "
"(занадто велика). Використовуємо нерозгорнутою.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s підпис від: \"%s\"\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6750,11 -5294,9 +6700,11 @@@ msgstr "
"УВАГА: примусове використання алгоритму контрольних сум %s (%d) не "
"відповідає параметрам отримувача\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "підписування:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "Буде використано шифрування %s\n"
@@@ -6859,7 -5381,6 +6809,7 @@@ msgstr "занадто велика о�
msgid "%s: directory does not exist!\n"
msgstr "%s: каталогу не існує!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, c-format
msgid "can't access '%s': %s\n"
msgstr "немає доступу до «%s»: %s\n"
@@@ -6969,68 -5468,47 +6919,59 @@@ msgstr "
msgid "input line longer than %d characters\n"
msgstr "рядок вхідних даних довший за %d символів\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr ""
"помилка під час спроби розпочати внесення змін до бази даних TOFU: %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr "помилка під час внесення змін до бази даних TOFU: %s\n"
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr "помилка під час скасовування змін у базі даних TOFU: %s\n"
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr "непідтримувана версія бази даних TOFU: %s\n"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "помилка під час спроби читання бази даних TOFU: %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, c-format
msgid "error determining TOFU database's version: %s\n"
msgstr "помилка під час спроби визначення версії бази даних TOFU: %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, c-format
msgid "error initializing TOFU database: %s\n"
msgstr "помилка під час спроби ініціалізації бази даних TOFU: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "помилка під час спроби відкрити бази даних TOFU «%s»: %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
- "Попередження: у домашньому каталозі містяться як tofu.db, так і tofu.d.\n"
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr "Використовуємо розділений формат для бази даних TOFU\n"
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "помилка під час спроби оновлення бази даних TOFU: %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr "Прив’язка %s є невідомою."
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
@@@ -7039,7 -5517,6 +6980,7 @@@ msgstr "
"Ключ із відбитком %s конфліктує із прив’язкою %s. Оскільки правилами цієї "
"прив’язки визначалося «автоматично», їх змінено на «запитувати»."
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
@@@ -7048,27 -5525,22 +6989,27 @@@ msgstr "
"Будь ласка, вкажіть, чи вважаєте прив’язку %s%sчинною (ключ належить "
"декларованому власнику) чи підробною (помилковою)."
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "помилка під час збирання інших ідентифікаторів користувачів: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr "Відомі ідентифікатори користувачів, пов’язані із цим ключем:\n"
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, c-format
msgid "policy: %s"
msgstr "правило: %s"
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, c-format
msgid "error gathering signature stats: %s\n"
msgstr ""
"помилка під час спроби зібрати статистичні дані щодо підписування: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, 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"
@@@ -7076,16 -5548,13 +7017,16 @@@ msgstr[0] "Адресу електро�
msgstr[1] "Адресу електронної пошти «%s» пов’язано із %d ключами:\n"
msgstr[2] "Адресу електронної пошти «%s» пов’язано із %d ключами:\n"
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "Статистичні дані для ключів із адресою електронної пошти «%s»:\n"
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
msgid "this key"
msgstr "цей ключ"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
@@@ -7093,7 -5562,6 +7034,7 @@@ msgstr[0] "%ld повідомленн�
msgstr[1] "%ld повідомлення підписано у майбутньому."
msgstr[2] "%ld повідомлень підписано у майбутньому."
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
@@@ -7101,7 -5569,6 +7042,7 @@@ msgstr[0] "підписано %ld по�
msgstr[1] "підписано %ld повідомлення"
msgstr[2] "підписано %ld повідомлень"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
@@@ -7109,7 -5576,6 +7050,7 @@@ msgstr[0] " протягом %ld поп
msgstr[1] " протягом %ld попередніх днів."
msgstr[2] " протягом %ld попередніх днів."
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
@@@ -7117,7 -5583,6 +7058,7 @@@ msgstr[0] " протягом %ld поп
msgstr[1] " протягом %ld попередніх тижнів."
msgstr[2] " протягом %ld попередніх тижнів."
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7128,7 -5593,6 +7069,7 @@@ msgstr[2] " протягом %ld поп
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
"Зазвичай, з певною адресою електронної пошти пов’язано лише один ключ. Втім, "
@@@ -7141,30 -5605,25 +7082,30 @@@
#. 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:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr "gGaAuUrRbB"
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
"(G)Добрий, (A)Прийняти одноразово, (U)Невідомий, (R)Відкинути одноразово, "
"(B)Поганий? "
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr ""
"помилка під час спроби встановлення рівня довіри до прив’язки TOFU до %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "помилка під час спроби змінити правила TOFU: %s\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
@@@ -7172,7 -5631,6 +7113,7 @@@ msgstr[0] "%d~рік
msgstr[1] "%d~роки"
msgstr[2] "%d~років"
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
@@@ -7180,7 -5638,6 +7121,7 @@@ msgstr[0] "%d~місяць
msgstr[1] "%d~місяці"
msgstr[2] "%d~місяців"
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
@@@ -7188,7 -5645,6 +7129,7 @@@ msgstr[0] "%d~день
msgstr[1] "%d~дні"
msgstr[2] "%d~днів"
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
@@@ -7196,7 -5652,6 +7137,7 @@@ msgstr[0] "%d~година
msgstr[1] "%d~години"
msgstr[2] "%d~годин"
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
@@@ -7204,7 -5659,6 +7145,7 @@@ msgstr[0] "%d~хвилина
msgstr[1] "%d~хвилини"
msgstr[2] "%d~хвилин"
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
@@@ -7212,12 -5666,10 +7153,12 @@@ msgstr[0] "%d~секунда
msgstr[1] "%d~секунди"
msgstr[2] "%d~секунд"
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr "Ніколи не перевірялося повідомлення, підписане ключем %s!\n"
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
@@@ -7226,12 -5678,10 +7167,12 @@@ msgstr "
"Не вдалося зібрати статистичні дані щодо підписування для «%s»\n"
"(ключ %s)\n"
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, c-format
msgid "Verified %ld messages signed by \"%s\"."
msgstr "Перевірено %ld повідомлень, підписаних «%s»."
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7249,20 -5699,16 +7190,20 @@@ msgstr[2] "
"Перевірено %ld повідомлень, підписаних «%s»,\n"
"протягом такого строку: %s."
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr "Останнє повідомлення було перевірено %s тому."
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr "Попередження: повідомлень, які було б підписано цим ключем, не було!\n"
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr "Попередження: цим ключем було підписано лише одне повідомлення!\n"
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7298,8 -5744,6 +7239,7 @@@ msgstr[2] "
" %s\n"
"для позначення ключа як помилкового.\n"
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "помилка під час спроби відкрити бази даних TOFU: %s\n"
@@@ -7848,7 -6183,6 +7788,7 @@@ msgstr "|N|Початковий нов�
msgid "run in multi server mode (foreground)"
msgstr "запустити у режимі декількох серверів (основному режимі)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|встановити вказаний рівень діагностики"
@@@ -7900,18 -6223,15 +7840,18 @@@ msgstr "
"Синтаксис: scdaemon [параметри] [команди [аргументи]]\n"
"Фонова служба карток пам’яті для @GNUPG@\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
"будь ласка, скористайтеся параметром «--daemon» для запуску програми у "
"фоновому режимі\n"
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr "запущено запуск обробки для дескриптора %d\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "роботу обробника для дескриптора %d перервано\n"
@@@ -8010,12 -6307,10 +7950,12 @@@ msgstr "будь ласка, перек
msgid "checking the CRL failed: %s"
msgstr "помилка під час перевірки CRL: %s"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr "сертифікат з некоректною чинністю: %s"
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr "сертифікат ще не набув чинності"
@@@ -8027,7 -6320,6 +7967,7 @@@ msgstr "кореневий сертиф
msgid "intermediate certificate not yet valid"
msgstr "проміжний сертифікат ще не набув чинності"
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
msgid "certificate has expired"
msgstr "строк дії сертифіката завершився"
@@@ -8076,7 -6357,6 +8016,7 @@@ msgstr " ( сертифікат чи
msgid " ( issuer valid from "
msgstr " ( видавець чинний з "
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, c-format
msgid "fingerprint=%s\n"
msgstr "відбиток=%s\n"
@@@ -8105,7 -6379,6 +8045,7 @@@ msgstr "у сертифікаті не
msgid "self-signed certificate has a BAD signature"
msgstr "самопідписаний сертифікат має ПОМИЛКОВИЙ підпис"
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr "кореневий сертифікат не позначено як надійний"
@@@ -8114,30 -6386,24 +8054,30 @@@
msgid "checking the trust list failed: %s\n"
msgstr "помилка перевірки списку довіри: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr "занадто довгий ланцюжок сертифікації\n"
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr "не знайдено видавця сертифіката"
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
msgid "certificate has a BAD signature"
msgstr "сертифікат має ПОМИЛКОВИЙ підпис"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr ""
"виявлено інший можливий відповідний сертифікат служби сертифікації (CA) — "
"повторюємо спробу"
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr "ланцюжок сертифікації є довшим за дозволений CA (%d)"
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
msgid "certificate is good\n"
msgstr "сертифікат є належним\n"
@@@ -8167,7 -6427,6 +8107,7 @@@ msgstr "%u-бітовий хеш не �
msgid "(this is the MD2 algorithm)\n"
msgstr "(це алгоритм MD2)\n"
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
msgid "none"
msgstr "немає"
@@@ -8202,36 -6456,28 +8142,36 @@@ msgstr "
"С/Н %s, ідентифікатор 0x%08lX,\n"
"створено %s, застаріває %s.\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr "не вказано використання ключа — припускаємо всі можливі використання\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "помилка під час спроби отримання даних щодо використання ключа: %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr "сертифікат не мав використовуватися для сертифікації\n"
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr "сертифікат не мав використовуватися для підписування відповідей OCSP\n"
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr "сертифікат не мав використовуватися для шифрування\n"
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr "сертифікат не мав використовуватися для підписування\n"
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr "сертифікат непридатний для шифрування\n"
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr "сертифікат непридатний для підписування\n"
@@@ -8659,21 -6815,17 +8599,21 @@@ msgstr "%s:%u: вказано паро�
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: пропускаємо цей рядок\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
msgid "could not parse keyserver\n"
msgstr "не вдалося обробити сервер ключів\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "імпортуємо загальні сертифікати «%s»\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "підписування за допомогою «%s» неможливе: %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr "некоректна команда (немає неявної команди)\n"
@@@ -8734,7 -6874,6 +8674,7 @@@ msgstr "проблема з повто�
msgid "error storing flags: %s\n"
msgstr "помилка під час спроби збереження позначок: %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr "Помилка - "
@@@ -8862,93 -6980,69 +8802,88 @@@ msgstr "не вдалося зняти
msgid "dropping %u certificates from the cache\n"
msgstr "викидання %u сертифікатів з кешу\n"
- #: dirmngr/certcache.c:352
- #, c-format
- msgid "can't access directory '%s': %s\n"
- msgstr "не вдалося отримати доступ до каталогу «%s»: %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, c-format
msgid "can't parse certificate '%s': %s\n"
msgstr "не вдалося обробити сертифікат «%s»: %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, c-format
msgid "certificate '%s' already cached\n"
msgstr "сертифікат «%s» вже кешовано\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "надійний сертифікат «%s» завантажено\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, c-format
msgid "certificate '%s' loaded\n"
msgstr "сертифікат «%s» завантажено\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr " відбиток SHA1 = %s\n"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr " видавець ="
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr " призначення ="
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "помилка під час спроби завантаження сертифіката «%s»: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, c-format
msgid "permanently loaded certificates: %u\n"
msgstr "остаточно завантажені сертифікати: %u\n"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, c-format
msgid " runtime cached certificates: %u\n"
msgstr " динамічно кешовані сертифікати: %u\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
msgid "certificate already cached\n"
msgstr "сертифікат вже кешовано\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
msgid "certificate cached\n"
msgstr "сертифікат кешовано\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, c-format
msgid "error caching certificate: %s\n"
msgstr "помилка під час спроби кешування сертифіката: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "некоректний рядок відбитка SHA1 «%s»\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "помилка під час спроби отримання сертифіката за серійним номером: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "помилка під час спроби отримання сертифіката за призначенням: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
msgid "no issuer found in certificate\n"
msgstr "у сертифікаті не виявлено запису видавця\n"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "помилка під час спроби отримання authorityKeyIdentifier: %s\n"
@@@ -9210,7 -7253,6 +9145,7 @@@ msgstr "серійний номер %s
msgid "error getting data from cache file: %s\n"
msgstr "помилка під час спроби отримання даних з файла кешу: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, c-format
msgid "unknown hash algorithm '%s'\n"
msgstr "невідомий алгоритм хешування «%s»\n"
@@@ -9229,7 -7268,6 +9164,7 @@@ msgstr "отримано некорек
msgid "converting S-expression failed: %s\n"
msgstr "спроба перетворення виразу S зазнала невдачі: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, c-format
msgid "creating S-expression failed: %s\n"
msgstr "спроба створення виразу S зазнала невдачі: %s\n"
@@@ -9617,112 -7575,81 +9552,108 @@@ msgstr "мало бути вказан�
msgid "looking up '%s'\n"
msgstr "пошук «%s»\n"
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr "запустити як службу windows (у фоновому режимі)"
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr "показати вміст кешу CRL"
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|завантажити CRL з вказаного файла до кешу"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|отримати CRL з вказаної адреси"
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr "завершити роботу dirmngr"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr "спорожнити кеш"
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr "|FILE|записувати журнал режиму сервера до файла"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
msgid "run without asking a user"
msgstr "запустити без запиту до користувача"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr "примусове завантаження застарілих САС"
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr "дозволити надсилання запитів OCSP"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr "заборонити використання HTTP"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr "заборонити використання LDAP"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr "ігнорувати точки поширення САС протоколу HTTP"
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr "ігнорувати точки поширення САС протоколу LDAP"
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr "ігнорувати адреси служб OCSP з сертифікатами"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|переспрямувати всі запити HTTP на вказану адресу"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HOST|використовувати вказаний вузол для запитів LDAP"
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "не використовувати резервні вузли з --ldap-proxy"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|прочитати список серверів LDAP з вказаного файла"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr "додати виявлені у точках поширення CRL нові сервери до списку серверів"
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|встановити вказаний час очікування даних від LDAP"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|використовувати відповідач OCSP за вказаною адресою"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|відповідь OCSP підписано FPR"
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr "|N|повертати не більше за вказану кількість записів на запит"
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr "|FILE|використовувати сертифікати CA з файла для HKP крізь TLS"
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr "маршрутизувати увесь обмін даними з мережею через Tor"
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9732,11 -7659,9 +9663,11 @@@ msgstr "
"(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
"довідника (man) «info»)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Використання: @DIRMNGR@ [параметри] (-h — довідка)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9744,78 -7669,61 +9675,78 @@@ msgstr "
"Синтаксис: @DIRMNGR@ [параметри] [команда [аргументи]]\n"
"Доступ до сервера ключів, CRL та OCSP для @GNUPG@\n"
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "коректними рівнями зневаджування є: %s\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, c-format
msgid "usage: %s [options] "
msgstr "використання: %s [параметри]"
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
msgid "colons are not allowed in the socket name\n"
msgstr "не можна використовувати двокрапки у назві сокета\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "помилка під час спроби отримання CRL з «%s»: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "помилка під час обробки CRL з «%s»: %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: занадто довгий рядок — пропущено\n"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: виявлено некоректний відбиток\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: помилка під час читання: %s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: беззмістовні дані наприкінці рядка проігноровано\n"
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
"отримано сигнал SIGHUP — повторне читання налаштувань та спорожнення кешу\n"
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr "отримано сигнал SIGUSR2 — дій не визначено\n"
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr "отримано сигнал SIGTERM — завершуємо роботу…\n"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "отримано сигнал SIGTERM — підтримується %d активних з’єднань\n"
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
msgid "shutdown forced\n"
msgstr "примусове завершення роботи\n"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr "отримано сигнал SIGINT — негайне завершення роботи\n"
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "отримано сигнал %d — дій не визначено\n"
@@@ -10147,98 -7985,77 +10078,98 @@@ msgstr "спроба хешуванн�
msgid "not signed by a default OCSP signer's certificate"
msgstr "не підписано типовим сертифікатом підписувальника OCSP"
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr "для відповідей за OCSP передбачено підтримку лише SHA-1\n"
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, c-format
msgid "allocating list item failed: %s\n"
msgstr "спроба розміщення пункту списку у пам’яті зазнала невдачі: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, c-format
msgid "error getting responder ID: %s\n"
msgstr "помилка під час спроби отримання ідентифікатора відповідача: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr "не виявлено придатного сертифіката для перевірки відповіді за OCSP\n"
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, c-format
msgid "issuer certificate not found: %s\n"
msgstr "не виявлено сертифіката видавця: %s\n"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr "викликаною підпрограмою не повернуто сертифіката призначення\n"
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
msgid "caller did not return the issuing certificate\n"
msgstr "викликаною підпрограмою не повернуто сертифіката видавця\n"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "не вдалося розмістити контекст OCSP: %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, c-format
msgid "can't get authorityInfoAccess: %s\n"
msgstr "не вдалося отримати authorityInfoAccess: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr "не визначено типового відповідача за OCSP\n"
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
msgid "no default OCSP signer defined\n"
msgstr "не визначено типового підписувача за OCSP\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr "використовуємо типовий відповідач за OCSP «%s»\n"
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, c-format
msgid "using OCSP responder '%s'\n"
msgstr "використовуємо відповідач за OCSP «%s»\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr "не вдалося встановити контекст хешування для OCSP: %s\n"
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "помилка під час отримання стану OCSP для сертифіката призначення: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr "стан сертифіката: %s (цей=%s наступний=%s)\n"
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr "придатний"
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "сертифікат було відкликано: %s причина: %s\n"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr "Відповідачем OCSP повернуто стан у майбутньому\n"
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr "Відповідачем OCSP повернуто не поточний стан\n"
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr "Відповідачем OCSP повернуто занадто застарілі дані щодо стану\n"
@@@ -10286,32 -8093,26 +10217,32 @@@ msgstr "помилка fetch_next_cert
msgid "max_replies %d exceeded\n"
msgstr "перевищено max_replies у %d\n"
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "не вдалося розмістити структуру керування: %s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "не вдалося розмістити контекст assuan: %s\n"
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "не вдалося ініціалізувати сервер: %s\n"
- #: dirmngr/server.c:2444
++#: dirmngr/server.c:2406
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "не вдалося зареєструвати команди за допомогою Assuan: %s\n"
- #: dirmngr/server.c:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "проблема з прийняттям Assuan: %s\n"
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "помилка обробки за допомогою Assuan: %s\n"
@@@ -10332,33 -8129,23 +10263,29 @@@ msgstr "не перевіряємо CR
msgid "checking CRL for"
msgstr "перевіряємо CRL щодо"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr "працюємо у режимі сумісності — ланцюжок сертифікації не перевірено!\n"
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
msgid "selfsigned certificate has a BAD signature"
msgstr "самопідписаний сертифікат має ПОМИЛКОВИЙ підпис"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr ""
"спроба перевірки надійності кореневого сертифіката зазнала невдачі: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
msgid "certificate chain is good\n"
msgstr "коректний ланцюжок сертифікації\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA потребує використання 160-бітового алгоритму хешування\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr "сертифікат не мав використовуватися для підписування CRL\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
msgid "quiet"
msgstr "без повідомлень"
@@@ -10486,11 -8242,9 +10413,11 @@@ msgstr "|N|встановити мак�
msgid "Options enforcing a passphrase policy"
msgstr "Параметри примусового використання правил паролів"
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr "не дозволяти обхід правил паролів"
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|встановити вказану мінімальну довжину нових паролів"
@@@ -10624,67 -8346,51 +10551,67 @@@ msgstr "Помилка зовнішнь
msgid "Note that group specifications are ignored\n"
msgstr "Зауважте, що специфікації груп буде проігноровано\n"
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr "показати список всіх компонентів"
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr "перевірити всі програми"
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr "|COMPONENT|показати список параметрів"
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr "|COMPONENT|змінити параметри"
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr "|COMPONENT|перевірити параметри"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr "застосувати загальні типові значення"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr "отримати назви каталогів налаштувань для @GPGCONF@"
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
msgid "list global configuration file"
msgstr "показати загальний файл налаштувань"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
msgid "check global configuration file"
msgstr "перевірити загальний файл налаштувань"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr "перезавантажити всі або вказаний компонент"
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr "запустити вказаний компонент"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr "завершити роботу вказаного компонента"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "використати файл для виведення даних"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr "якщо можна, задіяти зміни у динамічному режимі"
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Використання: @GPGCONF@ [параметри] (-h — довідка)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10692,15 -8398,12 +10619,15 @@@ msgstr "
"Синтаксис: @GPGCONF@ [параметри]\n"
"Керування параметрами налаштування інструментів системи @GNUPG@\n"
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr "Слід вказати один аргумент компонента"
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
msgid "Component not found"
msgstr "Компонент не знайдено"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
msgid "No argument allowed"
msgstr "Не можна вказувати аргументів"
@@@ -10752,122 -8446,97 +10679,122 @@@ msgstr "
"[параметри...] КОМАНДА [файл_вхідних_даних]\n"
"Виклик інструмента простого симетричного шифрування\n"
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "перервано спробу виконання %s для %s зі станом %i\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, c-format
msgid "%s on %s failed with status %i\n"
msgstr "невдала спроба виконання %s для %s зі станом %i\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "не вдалося створити тимчасовий каталог «%s»: %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr "не вдалося відкрити %s для запису: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, c-format
msgid "error writing to %s: %s\n"
msgstr "помилка під час запису до %s: %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, c-format
msgid "error reading from %s: %s\n"
msgstr "помилка читання з %s: %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, c-format
msgid "error closing %s: %s\n"
msgstr "помилка під час спроби закрити %s: %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
msgid "no --program option provided\n"
msgstr "не вказано параметра --program\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr "передбачено підтримку лише --decrypt і --encrypt\n"
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr "параметра --keyfile не передбачено\n"
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr "не вдалося розмістити у пам’яті вектор аргументів\n"
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, c-format
msgid "could not create pipe: %s\n"
msgstr "не вдалося створити канал: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, c-format
msgid "could not create pty: %s\n"
msgstr "не вдалося створити pty: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr "не вдалося створити відгалуження: %s\n"
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, c-format
msgid "execv failed: %s\n"
msgstr "помилка execv: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, c-format
msgid "select failed: %s\n"
msgstr "помилка select: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, c-format
msgid "read failed: %s\n"
msgstr "помилка читання: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, c-format
msgid "pty read failed: %s\n"
msgstr "помилка читання з pty: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, c-format
msgid "waitpid failed: %s\n"
msgstr "помилка waitpid: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr "дочірня підпрограма завершила роботу зі станом %i\n"
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "не вдалося розмістити у пам’яті рядок infile: %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "не вдалося розмістити у пам’яті рядок outfile: %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr "має бути вказано %s або %s\n"
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr "не вказано клас\n"
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, c-format
msgid "class %s is not supported\n"
msgstr "підтримки класу %s не передбачено\n"
diff --cc po/zh_CN.po
index 5365c98,5e16c8a..76c8b80
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.4.4\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2009-07-09 10:03+0200\n"
"Last-Translator: Meng Jie <zuxyhere at eastday.com>\n"
"Language-Team: Chinese (simplified) <i18n-translation at lists.linux.net.cn>\n"
@@@ -105,14 -89,10 +105,14 @@@ msgstr "请输入密码：这是一个�
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
#, fuzzy
msgid "Passphrase:"
msgstr "错误的密码"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr ""
@@@ -157,98 -129,70 +157,98 @@@ msgstr "损坏的多精度整数(MPI)
msgid "Bad Passphrase"
msgstr "错误的密码"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "不支持保护散列 %d\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, 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:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
msgstr "无法打开‘%s’： %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, fuzzy, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "找不到可写的私钥钥匙环：%s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, fuzzy, c-format
msgid "shadowing the key failed: %s\n"
msgstr "无法读出公钥：%s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, fuzzy, c-format
msgid "error writing key: %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "更改密码"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
"%s%%0Awithin gpg-agent's key storage"
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s：建立散列表失败：%s\n"
@@@ -395,8 -313,6 +395,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "更改密码"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -406,117 -322,86 +406,117 @@@ msgstr "
"选项：\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "详细模式"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "尽量减少提示信息"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "从‘%s’读取选项\n"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "在公钥服务器上搜寻密钥"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "导入后不更新信任度数据库"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, fuzzy
msgid "|NAME|accept some commands via NAME"
msgstr "|某甲|为收件者“某甲”加密"
- #: agent/gpg-agent.c:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "生成密码的时候发生错误：%s\n"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
#, fuzzy
msgid "allow presetting passphrase"
msgstr "生成密码的时候发生错误：%s\n"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "未被支持"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -525,136 -410,94 +525,128 @@@ 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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"请向 <@EMAIL@> 报告程序缺陷。\n"
"请向 <zuxyhere at eastday.com> 反映简体中文翻译的问题。\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr ""
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, 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:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "配置文件‘%s’：%s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "从‘%s’读取选项\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, 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:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "无法建立‘%s’：%s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "警告：扩展模块‘%s’权限不安全\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "更新失败：%s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "正在将私钥写至`%s'\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, 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:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
msgstr "已创建目录‘%s’\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "fstat(%d) 在 %s 中出错：%s\n"
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "无法建立目录‘%s’：%s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "读取‘%s’时出错：%s\n"
@@@ -669,28 -510,22 +661,28 @@@ msgstr "
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2390
++#: agent/gpg-agent.c:2392
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "更新私钥失败：%s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s：已跳过：%s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
@@@ -706,8 -539,6 +698,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -715,9 -546,6 +707,9 @@@ msgstr "
"@指令：\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -738,40 -564,33 +730,40 @@@ msgid "
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
#, fuzzy
msgid "cancelled\n"
msgstr "已取消"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "‘%s’中出错：%s\n"
@@@ -943,42 -733,30 +935,42 @@@ msgstr "保护算法 %d%s 未被支持\
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "保护算法 %d%s 未被支持\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "更新失败：%s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "读取‘%s’时出错：%s\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "读取‘%s’时出错：%s\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "读取‘%s’时出错：%s\n"
@@@ -993,36 -769,14 +985,17 @@@ msgstr "取得当前密钥信息时出�
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "无法连接至‘%s’：%s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr ""
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
msgid "problem setting the gpg-agent options\n"
msgstr ""
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- #, fuzzy
- msgid "canceled by user\n"
- msgstr "用户取消\n"
-
- #: common/simple-pwquery.c:579
- #, fuzzy
- msgid "problem with the agent\n"
- msgstr "代理程序有问题――正在停用代理程序\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "代理程序有问题――正在停用代理程序\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "无法禁用核心内存转储：%s\n"
@@@ -1107,7 -844,6 +1080,7 @@@ msgstr "
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "警告：“%s”选项已不建议使用\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1132,17 -864,14 +1105,17 @@@ msgstr "
msgid "connection to agent is in restricted mode\n"
msgstr "在批处理模式中无法完成此操作\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr ""
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr ""
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr ""
@@@ -1437,7 -1106,6 +1410,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
#, fuzzy
msgid "out of core\n"
msgstr "可选"
@@@ -1496,7 -1153,10 +1469,13 @@@ msgstr "找不到公钥 %s：%s\n
msgid "waiting for lock %s...\n"
msgstr "等待‘%s’上的锁\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr ""
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "ASCII 封装：%s\n"
@@@ -1727,10 -1332,6 +1706,10 @@@ msgstr "获取公钥的 URL：
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "错误：URL 太长(至多 %d 个字符)\n"
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
@@@ -2017,27 -1553,18 +1996,27 @@@ msgstr "不允许使用管理员命令\
msgid "Invalid command (try \"help\")\n"
msgstr "无效的指令(尝试“help”)\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "无法打开‘%s’\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "密钥‘%s’找不到：%s\n"
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "读取密钥区块时发生错误：%s\n"
@@@ -2099,62 -1614,51 +2078,62 @@@ msgstr "公钥“%s”有对应的私�
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "在此 S2K 模式下无法使用对称的 ESK 包\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "使用对称加密算法 %s\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "‘%s’已被压缩\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "警告：‘%s’是一个空文件\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "正在从‘%s’读取\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项中\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s 已经加密给：“%s”\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "您不该将 %s 用于 %s 模式中\n"
@@@ -2259,8 -1742,6 +2238,8 @@@ msgstr "导出时尽可能清除密钥�
msgid " - skipped"
msgstr "%s：已跳过：%s\n"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2295,8 -1769,6 +2274,8 @@@ msgstr "建立‘%s’时发生错误�
msgid "[User ID not found]"
msgstr "[找不到用户标识]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "无效的列表选项\n"
@@@ -2366,217 -1825,168 +2345,217 @@@ msgstr "--allow-non-selfsigned-uid 使�
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子钥 %s 而非主钥 %s\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "|[文件名]|生成一份签名"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
#, fuzzy
msgid "make a clear text signature"
msgstr "|[文件名]|生成一份明文签名"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "生成一份分离的签名"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "加密数据"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "仅使用对称加密"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "解密数据(默认)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "验证签名"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "列出密钥"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "列出密钥和签名"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "list and check key signatures"
msgstr "列出并检查密钥签名"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "列出密钥和指纹"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "列出私钥"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "生成一份吊销证书"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "从公钥钥匙环里删除密钥"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "从私钥钥匙环里删除密钥"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "为某把密钥添加签名"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "为某把密钥添加本地签名"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "为某把密钥添加签名"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "为某把密钥添加本地签名"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "编辑某把密钥或为其添加签名"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "更改密码"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "导出密钥"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "把密钥导出到某个公钥服务器上"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "从公钥服务器上导入密钥"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "在公钥服务器上搜寻密钥"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "从公钥服务器更新所有的本地密钥"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "导入/合并密钥"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr "打印卡状态"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr "更改卡上的数据"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr "更改卡的 PIN"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "更新信任度数据库"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
#, fuzzy
msgid "print message digests"
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "输出经 ASCII 封装"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|某甲|为收件者“某甲”加密"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "使用这个用户标识来签名或解密"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "使用标准的文本模式"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "从‘%s’读取选项\n"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "不做任何改变"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "覆盖前先询问"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr "行为严格遵循 OpenPGP 定义"
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2584,7 -1994,6 +2563,7 @@@ msgstr "
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2604,13 -2013,11 +2583,13 @@@ msgstr "
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2625,7 -2032,6 +2604,7 @@@ msgstr "
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2633,80 -2039,65 +2612,80 @@@ msgstr "
"\n"
"支持的算法：\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "公钥："
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "对称加密："
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "散列："
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "压缩："
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "用法：gpg [选项] "
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, fuzzy, c-format
#| msgid "no = sign found in group definition `%s'\n"
msgid "no = sign found in group definition '%s'\n"
msgstr "在‘%s’组定义里找不到等号(=)\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "警告：用户目录‘%s’所有权不安全\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "警告：配置文件‘%s’所有权不安全\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on extension `%s'\n"
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "警告：扩展模块‘%s’所有权不安全\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "警告：用户目录‘%s’权限不安全\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "警告：配置文件‘%s’权限不安全\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on extension `%s'\n"
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "警告：扩展模块‘%s’权限不安全\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2714,19 -2105,16 +2693,19 @@@ msgid "
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2735,513 -2123,397 +2714,508 @@@ msgid "
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "未知的配置项‘%s’\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr "列出密钥时显示用户标识"
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
#, fuzzy
#| msgid "show user ID validity during key listings"
msgid "show key usage information during key listings"
msgstr "列出密钥时显示用户标识的有效性"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr "列出签名时显示策略 URL"
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
msgid "show all notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr "列出签名时显示用户提供的注记"
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出密钥时显示首选公钥服务器 URL"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr "列出密钥时显示用户标识的有效性"
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr "列出密钥时显示已吊销或已过期的用户标识"
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr "列出密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
msgid "show the keyring name in key listings"
msgstr "列出密钥时显示钥匙环的名称"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
msgid "show expiration dates during signature listings"
msgstr "列出签名时显示过期日期"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "禁用密钥"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "未知的选项 '%s'\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "未知的选项 '%s'\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, fuzzy, c-format
#| msgid "NOTE: old default options file `%s' ignored\n"
msgid "Note: old default options file '%s' ignored\n"
msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr ""
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, fuzzy, c-format
#| msgid "NOTE: %s is not for normal use!\n"
msgid "Note: %s is not for normal use!\n"
msgstr "注意：一般情况下不会用到 %s！\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, fuzzy, c-format
#| msgid "`%s' is not a valid signature expiration\n"
msgid "'%s' is not a valid signature expiration\n"
msgstr "‘%s’不是一个有效的签名过期日期\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "电子邮件地址无效\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, fuzzy, c-format
#| msgid "`%s' is not a valid character set\n"
msgid "'%s' is not a valid character set\n"
msgstr "‘%s’不是一个有效的字符集\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s：%d：无效的公钥服务器选项\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s：%d：无效的导入选项\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "无效的列表选项\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s：%d：无效的导出选项\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s：%d：无效的列表选项\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr "验证签名时显示照片标识"
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr "验证签名时显示策略 URL"
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
msgid "show all notations during signature verification"
msgstr "验证签名时显示所有注记"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr "验证签名时显示 IETF 标准注记"
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr "验证签名时显示用户提供的注记"
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
msgid "show preferred keyserver URLs during signature verification"
msgstr "验证签名时显示首选公钥服务器 URL"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
msgid "show user ID validity during signature verification"
msgstr "验证签名时显示用户标识的有效性"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr "使用 PKA 数据验证签名的有效性"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提升带有有效 PKA 数据的签名的信任度"
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s：%d：无效的校验选项\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s：%d：无效的 auto-key-locate 清单\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "警告：程序可能会创建核心内存转储！\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告：%s 会使得 %s 失效\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义！\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签名数一定要大于 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签名数一定要大于 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
#, fuzzy
#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, fuzzy, c-format
#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, fuzzy, c-format
#| msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, fuzzy, c-format
#| msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败：%s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [文件名]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, fuzzy, c-format
#| msgid "symmetric encryption of `%s' failed: %s\n"
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "对称加密‘%s’失败：%s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [文件名]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key 用户标识"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败：%s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败：%s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败：%s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "导出密钥失败：%s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败：%s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败：%s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败：%s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败：%s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[文件名]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签名策略 URL 无效\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
@@@ -3285,329 -2549,263 +3259,329 @@@ msgstr "没有可用的帮助
msgid "No help available for '%s'"
msgstr "‘%s’没有可用的帮助"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr "导入被标记为局部的签名"
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr "导入时修复 PKS 公钥服务器导致的损坏"
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "导入后不更新信任度数据库"
- #: g10/import.c:143
++#: g10/import.c:147
msgid "do not update the trustdb after import"
msgstr "导入后不更新信任度数据库"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "显示密钥指纹"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr "只接受对已有密钥的更新"
- #: g10/import.c:152
++#: g10/import.c:156
msgid "remove unusable parts from key after import"
msgstr "导入后清除密钥中无用的部分"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr "导入后尽可能清除密钥中的可选部分"
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "跳过 %d 样式的区块\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, c-format
msgid "%lu keys processed so far\n"
msgstr "目前已处理 %lu 把密钥\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "合计被处理的数量：%lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " 已跳过的新密钥：%lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " 已跳过的新密钥：%lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " 遗失用户标识：%lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " 已导入：%lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " 未改变：%lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " 新用户标识：%lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " 新的子钥：%lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " 新的签名：%lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " 新的密钥吊销：%lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " 读取的私钥：%lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " 导入的私钥：%lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " 未改变的私钥：%lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " 未被导入：%lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " 清除的签名：%lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " 清除的用户标识：%lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, fuzzy, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的算法：\n"
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " “%s”：对称加密算法 %s 对应首选项\n"
- #: g10/import.c:1042
++#: g10/import.c:1048
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " “%s”：散列算法 %s 对应首选项\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " “%s”：压缩算法 %s 对应首选项\n"
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "强烈建议您更新您的首选项并重新分发这把密钥，\n"
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "以避免可能的算法不匹配问题\n"
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "您可以这样更新您的首选项：gpg --edit-key %s updpref save\n"
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, c-format
msgid "key %s: no user ID\n"
msgstr "密钥 %s：没有用户标识\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "“%s”已跳过：%s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1264
++#: g10/import.c:1343
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "密钥 %s：PKS 子钥破损已修复\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "密钥 %s：已接受不含自身签名的用户标识“%s”\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "密钥 %s：没有有效的用户标识\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "这可能由于遗失自身签名所致\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "密钥 %s：找不到公钥：%s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "密钥 %s：新密钥――已跳过\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "找不到可写的钥匙环：%s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "密钥 %s：公钥“%s”已导入\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "密钥 %s：与我们的副本不吻合\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "密钥 %s：“%s”一个新的用户标识\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "密钥 %s：“%s”1 个新的签名\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "密钥 %s：“%s”%d 个新的签名\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "密钥 %s：“%s”1 个新的子钥\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "密钥 %s：“%s”%d 个新的子钥\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "密钥 %s：“%s”%d 个签名被清除\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "密钥 %s：“%s”%d 个签名被清除\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "密钥 %s：“%s”未改变\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, c-format
msgid "key %s: secret key imported\n"
msgstr "密钥 %s：私钥已导入\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "已跳过：私钥已存在\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key %s: %s\n"
msgstr "找不到私钥“%s”：%s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
msgid "importing secret keys not allowed\n"
msgstr "不允许导入私钥\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
@@@ -3622,87 -2820,70 +3596,87 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "密钥 %s：“%s”吊销证书已被导入\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "密钥 %s：签名没有用户标识\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "密钥 %s：用户标识“%s”自身签名无效\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "密钥 %s：不支持的公钥算法\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "密钥 %s：已新增直接密钥签名\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "密钥 %s：没有可供绑定的子钥\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "密钥 %s：无效的子钥绑定\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "密钥 %s：已删除多重子钥绑定\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "密钥 %s：没有用于密钥吊销的子钥\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "密钥 %s：无效的子钥吊销\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "密钥 %s：已删除多重子钥吊销\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "密钥 %s：已跳过用户标识“%s”\n"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "密钥 %s：已跳过子钥\n"
@@@ -3711,52 -2892,42 +3685,52 @@@
# * to import non-exportable signature when we have the
# * the secret key used to create this signature - it
# * seems that this makes sense
- #: g10/import.c:2516
++#: g10/import.c:2609
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "密钥 %s：不可导出的签名(验证级别 0x%02X)――已跳过\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "密钥 %s：子钥签名位置错误――已跳过\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "密钥 %s：与预期不符的签名验证级别(0x%02X)――已跳过\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "密钥 %s：已新增吊销证书“%s”\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "密钥 %s：已新增直接密钥签名\n"
@@@ -4088,8 -3197,6 +4062,8 @@@ msgstr "我非常小心地检查过这�
msgid "Really sign? (y/N) "
msgstr "真的要签名吗？(y/N)"
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "签名时失败： %s\n"
@@@ -4549,13 -3554,9 +4523,13 @@@ msgid "
"unless you restart the program.\n"
msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
msgid "revoked"
msgstr "已吊销"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "已过期"
@@@ -5495,13 -4318,11 +5469,13 @@@ msgstr "密钥指纹 =
msgid " Card serial no. ="
msgstr "卡序列号 ="
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "缓存钥匙环‘%s’\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5509,14 -4330,12 +5483,14 @@@ msgid_plural "%lu keys cached so far (%
msgstr[0] "目前已缓存 %lu 把密钥(%lu 份签名)\n"
msgstr[1] "目前已缓存 %lu 把密钥(%lu 份签名)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5524,7 -4343,6 +5498,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 个损坏的签名\n"
msgstr[1] "1 个损坏的签名\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s：钥匙环已建立\n"
@@@ -5741,116 -4514,97 +5715,122 @@@ msgstr "独立的吊销证书――请�
msgid "no signature found\n"
msgstr "未找到签名\n"
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, c-format
msgid "BAD signature from \"%s\""
msgstr "已损坏的签名，来自于“%s”"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, c-format
msgid "Expired signature from \"%s\""
msgstr "过期的签名，来自于“%s”"
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的签名，来自于“%s”"
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "签名验证已被抑制\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
msgid "can't handle this ambiguous signature data\n"
msgstr "无法处理这些有歧义的签名\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, c-format
msgid "Signature made %s\n"
msgstr "签名建立于 %s\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 密钥 %s\n"
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "于 %s 创建的签名，使用 %s，钥匙号 %s\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ #| msgid " aka \"%s\""
+ msgid " issuer \"%s\"\n"
+ msgstr " 亦即“%s”"
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "可用的密钥在："
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[不确定]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, c-format
msgid " aka \"%s\""
msgstr " 亦即“%s”"
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "这份签名已于 %s 过期。\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "这份签名在 %s 过期。\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, fuzzy, c-format
#| msgid "%s signature, digest algorithm %s\n"
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s 签名，散列算法 %s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "二进制"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "文本模式"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "未知"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "未知的公钥算法"
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "无法检查签名：%s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "不是一份分离的签名\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告：检测到多重签名。只检查第一个签名。\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等级 0x%02x 的独立签名\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "旧式(PGP 2.x)签名\n"
@@@ -6036,87 -4755,46 +6016,57 @@@ msgstr "警告：潜在不安全的对�
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 类别的子包设定了关键位\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "代理程序有问题――正在停用代理程序\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, c-format
- msgid " (main key ID %s)"
- msgstr " (主钥匙号 %s)"
-
- #: g10/passphrase.c:277
- #, fuzzy, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "您需要这个用户的密码来解开私钥：\n"
- "“%.*s”\n"
- "%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "请输入密码\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "用户取消\n"
- #: g10/passphrase.c:483
- #, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr "您需要输入密码，才能解开这个用户的私钥：“%s”\n"
-
- #: g10/passphrase.c:491
- #, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%u 位的 %s 密钥，钥匙号 %s，建立于 %s"
-
- #: g10/passphrase.c:500
++#: g10/passphrase.c:489
#, c-format
- msgid " (subkey on main key ID %s)"
- msgstr " (主钥 %s 的子钥)"
+ msgid " (main key ID %s)"
+ msgstr " (主钥匙号 %s)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "您真的想要删除选定的密钥吗？(y/N)"
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "您真的想要删除选定的密钥吗？(y/N)"
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, fuzzy, c-format
#| msgid "%u-bit %s key, ID %s, created %s"
msgid ""
@@@ -6309,124 -4952,97 +6259,124 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "无论如何还是使用这把密钥吗？(y/N)"
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "警告：正在使用不被信任的密钥！\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "警告：此密钥可能已被吊销(吊销密钥不存在)\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "警告：这把密钥已经被它的指定吊销者吊销了！\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "警告：这把密钥已经被它的持有者吊销了！\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
msgid " This could mean that the signature is forged.\n"
msgstr " 这表明这个签名有可能是伪造的。\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "警告：这把子钥已经被它的持有者吊销了！\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "注意：这把密钥已经被禁用了。\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, fuzzy, c-format
#| msgid "Note: Verified signer's address is `%s'\n"
msgid "Note: Verified signer's address is '%s'\n"
msgstr "注意：验证过的签名者的地址是‘%s’\n"
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, fuzzy, c-format
#| msgid "Note: Signer's address `%s' does not match DNS entry\n"
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "注意：签名者的地址‘%s’不匹配任何 DNS 记录\n"
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "PKA 信息有效，信任级别调整到“完全”\n"
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "PKA 信息无效，信任级别调整到“从不”\n"
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "注意：这把密钥已经过期了！\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "警告：这把密钥未经受信任的签名认证！\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " 没有证据表明这个签名属于它所声称的持有者。\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "警告：我们不信任这把密钥！\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " 这个签名很有可能是伪造的。\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "警告：这把密钥未经有足够信任度的签名所认证。\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " 这份签名并不一定属于它所声称的持有者\n"
- #: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s：已跳过：%s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s：已跳过：公钥已被禁用\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: 已跳过：公钥已存在\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/pkclist.c:991
++#: g10/pkclist.c:995
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/pkclist.c:1094
++#: g10/pkclist.c:1098
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr "当前收件人：\n"
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6434,37 -5050,29 +6384,37 @@@ msgstr "
"\n"
"输入用户标识。以空白行结束："
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "没有这个用户标识。\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
msgid "skipped: public key already set as default recipient\n"
msgstr "已跳过：公钥已被设为默认收件者\n"
- #: g10/pkclist.c:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "公钥被禁用。\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "已跳过：公钥已被设定\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "未知的默认收件者“%s”\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "没有有效的地址\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "密钥 %s：没有有效的用户标识\n"
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "密钥 %s：没有有效的用户标识\n"
@@@ -6744,7 -5300,6 +6694,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "公钥 %s 在其签名后 %lu 秒生成\n"
msgstr[1] "公钥 %s 在其签名后 %lu 秒生成\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6809,22 -5355,18 +6759,22 @@@ msgid "
"unexpanded.\n"
msgstr "警告：无法 %%-扩展首选公钥服务器 URL (太大了)。现在使用未扩展的。\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s 签名来自：“%s”\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "正在签名："
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s 加密将被采用\n"
@@@ -6930,7 -5452,6 +6880,7 @@@ msgstr "信任度数据库处理量过�
msgid "%s: directory does not exist!\n"
msgstr "%s：目录不存在！\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7043,151 -5542,118 +6993,143 @@@ msgstr "无法处理长于 %d 字符的
msgid "input line longer than %d characters\n"
msgstr "输入行长度超过 %d 字符\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"支持的算法：\n"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s：写入目录记录时出错：%s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "‘%s’中出错：%s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "有效性：%s"
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "列出密钥"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7197,93 -5663,78 +7139,93 @@@ msgstr[1] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
msgid "Verified %ld messages signed by \"%s\"."
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7294,20 -5745,16 +7236,20 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7324,8 -5771,6 +7266,7 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "读取‘%s’时出错：%s\n"
@@@ -7867,7 -6203,6 +7808,7 @@@ msgstr "新的 PIN
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7920,16 -6244,13 +7861,16 @@@ msgid "
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8033,12 -6331,10 +7974,12 @@@ msgstr "
msgid "checking the CRL failed: %s"
msgstr "检查已建立的签名时发生错误： %s\n"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr ""
@@@ -8051,7 -6345,6 +7992,7 @@@ msgstr "不允许导出私钥\n
msgid "intermediate certificate not yet valid"
msgstr ""
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
#, fuzzy
msgid "certificate has expired"
msgstr "这把密钥已经过期！"
@@@ -8108,7 -6390,6 +8049,7 @@@ msgstr "证书已损坏
msgid " ( issuer valid from "
msgstr "卡序列号 ="
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "CA 指纹："
@@@ -8138,7 -6413,6 +8079,7 @@@ msgstr "生成一份吊销证书
msgid "self-signed certificate has a BAD signature"
msgstr ""
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr ""
@@@ -8147,29 -6420,23 +8088,29 @@@
msgid "checking the trust list failed: %s\n"
msgstr "检查已建立的签名时发生错误： %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr ""
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr ""
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "验证签名"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr ""
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
#, fuzzy
msgid "certificate is good\n"
msgstr "首选项‘%s’重复\n"
@@@ -8202,7 -6463,6 +8143,7 @@@ msgstr "
msgid "(this is the MD2 algorithm)\n"
msgstr ""
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
#, fuzzy
msgid "none"
msgstr "no"
@@@ -8238,36 -6493,28 +8179,36 @@@ msgstr "
"“%.*s”\n"
"%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr ""
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr ""
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr ""
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr ""
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr ""
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr ""
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr ""
@@@ -8711,22 -6868,18 +8652,22 @@@ msgstr "
msgid "%s:%u: skipping this line\n"
msgstr " s = 跳过这把密钥\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "无法解析公钥服务器 URL\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "无法存取‘%s’：%s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8789,7 -6930,6 +8730,7 @@@ msgstr "
msgid "error storing flags: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr ""
@@@ -8906,99 -7025,74 +8847,93 @@@ msgstr "
msgid "dropping %u certificates from the cache\n"
msgstr ""
- #: dirmngr/certcache.c:352
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
- msgid "can't access directory '%s': %s\n"
- msgstr "无法建立目录‘%s’：%s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't parse certificate '%s': %s\n"
msgstr "无法建立‘%s’：%s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, fuzzy, c-format
msgid "certificate '%s' already cached\n"
msgstr "首选项‘%s’重复\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, fuzzy, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "已建立吊销证书。\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, fuzzy, c-format
msgid "certificate '%s' loaded\n"
msgstr "首选项‘%s’重复\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, fuzzy, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr "CA 指纹："
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr ""
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr ""
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, fuzzy, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, fuzzy, c-format
msgid "permanently loaded certificates: %u\n"
msgstr "证书已损坏"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, fuzzy, c-format
msgid " runtime cached certificates: %u\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
#, fuzzy
msgid "certificate already cached\n"
msgstr "已建立吊销证书。\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
#, fuzzy
msgid "certificate cached\n"
msgstr "首选项‘%s’重复\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "指纹无效"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, fuzzy, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, fuzzy, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
#, fuzzy
msgid "no issuer found in certificate\n"
msgstr "生成一份吊销证书"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, fuzzy, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
@@@ -9262,7 -7305,6 +9197,7 @@@ msgstr "
msgid "error getting data from cache file: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "unknown hash algorithm '%s'\n"
@@@ -9282,7 -7321,6 +9217,7 @@@ msgstr "
msgid "converting S-expression failed: %s\n"
msgstr "签名时失败： %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, fuzzy, c-format
msgid "creating S-expression failed: %s\n"
msgstr "无法读出公钥：%s\n"
@@@ -9683,117 -7641,86 +9618,113 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr ""
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "从‘%s’读取选项\n"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "要不保存而离开吗？(y/N)"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "从‘%s’读取选项\n"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "无法解析公钥服务器 URL\n"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9806,95 -7733,76 +9737,95 @@@ msgstr "
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "用法：gpg [选项] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
#, 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:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, 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:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "列太长"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "指纹无效"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "%s:%u: read error: %s\n"
msgstr "读取‘%s’错误：%s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "可选"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10245,104 -8083,83 +10176,104 @@@ msgstr "检查已建立的签名时发�
msgid "not signed by a default OCSP signer's certificate"
msgstr ""
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr ""
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, fuzzy, c-format
msgid "allocating list item failed: %s\n"
msgstr "无法读出公钥：%s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error getting responder ID: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr ""
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, fuzzy, c-format
msgid "issuer certificate not found: %s\n"
msgstr "找不到私钥“%s”：%s\n"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr ""
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
#, fuzzy
msgid "caller did not return the issuing certificate\n"
msgstr "生成一份吊销证书"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, fuzzy, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "无法存储密钥：%s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't get authorityInfoAccess: %s\n"
msgstr "无法存取‘%s’：%s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr ""
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
#, fuzzy
#| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
msgstr "没有默认的私钥钥匙环： %s\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr ""
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, fuzzy, c-format
#| msgid "using cipher %s\n"
msgid "using OCSP responder '%s'\n"
msgstr "使用对称加密算法 %s\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr ""
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, fuzzy, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr ""
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr ""
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, fuzzy, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "注意：密钥已被吊销"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr ""
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr ""
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr ""
@@@ -10390,34 -8197,28 +10321,34 @@@ msgstr "删除密钥区块时失败：%
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "不能创建备份文件‘%s’：%s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s：建立散列表失败：%s\n"
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, 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:2444
++#: dirmngr/server.c:2406
#, 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:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10442,34 -8239,24 +10373,30 @@@ msgstr "
msgid "checking CRL for"
msgstr "检查已建立的签名时发生错误： %s\n"
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
#, fuzzy
msgid "selfsigned certificate has a BAD signature"
msgstr "验证签名"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, fuzzy, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "检查已建立的签名时发生错误： %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
#, fuzzy
msgid "certificate chain is good\n"
msgstr "首选项‘%s’重复\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA 要求使用 160 位的散列算法\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "quit"
@@@ -10597,11 -8353,9 +10524,11 @@@ msgstr "
msgid "Options enforcing a passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr ""
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
@@@ -10740,85 -8462,66 +10667,85 @@@ msgstr "
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
#, fuzzy
msgid "list global configuration file"
msgstr "未知的配置项‘%s’\n"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
#, fuzzy
msgid "check global configuration file"
msgstr "未知的配置项‘%s’\n"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "指定输出文件"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
#, fuzzy
msgid "Component not found"
msgstr "找不到公钥"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
#, fuzzy
msgid "No argument allowed"
msgstr "不允许使用管理员命令\n"
@@@ -10872,123 -8566,98 +10799,123 @@@ msgid "
"Call a simple symmetric encryption tool\n"
msgstr ""
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s 不可与 %s 并用\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "‘%s’的 fstat 在 %s 中出错：%s\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, fuzzy, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "无法建立目录‘%s’：%s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr ""
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "‘%s’中出错：%s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
#, fuzzy
msgid "no --program option provided\n"
msgstr "不支持远程调用\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr ""
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr ""
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "无法建立‘%s’：%s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "无法建立‘%s’：%s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr ""
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "更新失败：%s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "更新失败：%s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "更新失败：%s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "更新失败：%s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "不能创建备份文件‘%s’：%s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "不能创建备份文件‘%s’：%s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr ""
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "不支持保护散列 %d\n"
diff --cc po/zh_TW.po
index c16c69c,15677d7..a065269
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
msgstr ""
"Project-Id-Version: GNU gnupg 2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"POT-Creation-Date: 2016-08-18 17:17+0200\n"
"PO-Revision-Date: 2014-11-22 20:56+0800\n"
"Last-Translator: Jedi Lin <Jedi at Jedi.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@@ -112,13 -96,9 +112,13 @@@ msgstr "請輸入你的密語以便在�
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:721 tools/symcryptrun.c:443
++#: agent/protect-tool.c:714 tools/symcryptrun.c:440
msgid "Passphrase:"
msgstr "密語:"
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
- #: tools/symcryptrun.c:442
++#: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: tools/symcryptrun.c:439
msgid "does not match - try again"
msgstr "前後不一致 - 請再試一次"
@@@ -158,64 -130,42 +158,64 @@@ msgstr "不良的個人識別碼 (PIN)
msgid "Bad Passphrase"
msgstr "不良的密語"
- #: agent/command-ssh.c:651 agent/command-ssh.c:746
++#: agent/command-ssh.c:635 agent/command-ssh.c:730
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
- #: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
#, c-format
msgid "can't create '%s': %s\n"
msgstr "無法建立 '%s': %s\n"
- #: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
- #: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
- #: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
- #: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
- #: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
++#: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
++#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
++#: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
#, c-format
msgid "can't open '%s': %s\n"
msgstr "無法開啟 '%s': %s\n"
- #: agent/command-ssh.c:2535 agent/command-ssh.c:2553
++#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "取得此卡片序號時出錯: %s\n"
- #: agent/command-ssh.c:2539
++#: agent/command-ssh.c:2419
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "偵測到卡片, 其序號為: %s\n"
- #: agent/command-ssh.c:2544
++#: agent/command-ssh.c:2424
#, c-format
msgid "no authentication key for ssh on card: %s\n"
msgstr "卡片上沒有 ssh 用的認證金鑰: %s\n"
- #: agent/command-ssh.c:2564
++#: agent/command-ssh.c:2444
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "找不到合適的卡片金鑰: %s\n"
- #: agent/command-ssh.c:2614
++#: agent/command-ssh.c:2494
#, c-format
msgid "shadowing the key failed: %s\n"
msgstr "遮蔽金鑰時失敗: %s\n"
- #: agent/command-ssh.c:2629
++#: agent/command-ssh.c:2509
#, c-format
msgid "error writing key: %s\n"
msgstr "寫入金鑰時出錯: %s\n"
- #: agent/command-ssh.c:2912
++#: agent/command-ssh.c:2739
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -223,24 -173,19 +223,24 @@@
msgstr ""
"有某個 ssh 程序提出使用金鑰 %%0A %s%%0A (%s)%%0A 之請求, 請問是否允許?"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Allow"
msgstr "允許"
- #: agent/command-ssh.c:2919
++#: agent/command-ssh.c:2746
msgid "Deny"
msgstr "拒絕"
- #: agent/command-ssh.c:2928
++#: agent/command-ssh.c:2755
#, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "請輸入此 ssh 金鑰的密語 %%0A %F%%0A (%c)"
- #: agent/command-ssh.c:3167 agent/genkey.c:351
++#: agent/command-ssh.c:2994 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "請再次輸入密語"
- #: agent/command-ssh.c:3192
++#: agent/command-ssh.c:3021
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -248,7 -193,6 +248,7 @@@
msgstr ""
"請輸入密語以保護收到的私鑰 %%0A %s%%0A %s%%0A 於 gpg-agent 的金鑰存放處"
- #: agent/command-ssh.c:3712
++#: agent/command-ssh.c:3541
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "從 socket 建立串流失敗: %s\n"
@@@ -378,8 -296,6 +378,8 @@@ msgstr "請輸入密語至%0A以保護�
msgid "Please enter the new passphrase"
msgstr "請輸入新的密語"
- #: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -387,132 -303,94 +387,132 @@@ msgstr "
"@選項:\n"
" "
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
msgid "run in daemon mode (background)"
msgstr "以服務模式執行 (背景)"
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
msgid "run in server mode (foreground)"
msgstr "以伺服器模式執行 (前景)"
- #: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
++#: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
msgid "verbose"
msgstr "囉唆模式"
- #: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "盡量安靜些"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
msgid "sh-style command output"
msgstr "sh 樣式的指令輸出"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
msgid "csh-style command output"
msgstr "csh 樣式的指令輸出"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
++#: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|檔案|從指定檔案中讀取選項"
- #: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
msgid "do not detach from the console"
msgstr "不要從 console 分離"
- #: agent/gpg-agent.c:167
++#: agent/gpg-agent.c:166
msgid "do not grab keyboard and mouse"
msgstr "不要奪取鍵盤及滑鼠"
- #: agent/gpg-agent.c:168 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:167 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "為伺服器使用日誌檔"
- #: agent/gpg-agent.c:170
++#: agent/gpg-agent.c:169
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|使用 PGM 做為 PIN-Entry 程式"
- #: agent/gpg-agent.c:175
++#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
- #: agent/gpg-agent.c:177
++#: agent/gpg-agent.c:176
msgid "do not use the SCdaemon"
msgstr "不要使用 SCdaemon"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:180
#, fuzzy
#| msgid "|NAME|connect to host NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|名稱|連線至位於指定名稱的主機"
- #: agent/gpg-agent.c:197
++#: agent/gpg-agent.c:196
msgid "ignore requests to change the TTY"
msgstr "忽略變更 TTY 的要求"
- #: agent/gpg-agent.c:199
++#: agent/gpg-agent.c:198
msgid "ignore requests to change the X display"
msgstr "忽略變更 X display 的要求"
- #: agent/gpg-agent.c:202
++#: agent/gpg-agent.c:201
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|讓快取住的個人識別碼 (PIN) 在 N 秒後到期"
- #: agent/gpg-agent.c:216
++#: agent/gpg-agent.c:215
msgid "do not use the PIN cache when signing"
msgstr "簽署時不要使用個人識別碼 (PIN) 快取"
- #: agent/gpg-agent.c:218
++#: agent/gpg-agent.c:217
#, fuzzy
#| msgid "do not allow the reuse of old passphrases"
msgid "disallow the use of an external password cache"
msgstr "不允許重複使用舊密語"
- #: agent/gpg-agent.c:220
++#: agent/gpg-agent.c:219
msgid "disallow clients to mark keys as \"trusted\""
msgstr "不允許用戶端將金鑰標記為 \"已信任\""
- #: agent/gpg-agent.c:223
++#: agent/gpg-agent.c:222
msgid "allow presetting passphrase"
msgstr "允許預先設定密語"
- #: agent/gpg-agent.c:225
++#: agent/gpg-agent.c:224
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:227
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:230
++#: agent/gpg-agent.c:229
msgid "enable ssh support"
msgstr "啟用 ssh 支援"
- #: agent/gpg-agent.c:233
++#: agent/gpg-agent.c:232
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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
++#: agent/gpg-agent.c:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "翻譯瑕疵請回報給 <Jedi at Jedi.org>, 程式瑕疵則請回報給 <@EMAIL@>.\n"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:481
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "用法: @GPG_AGENT@ [選項] (或用 -h 求助)"
- #: agent/gpg-agent.c:484
++#: agent/gpg-agent.c:483
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -520,108 -398,73 +520,100 @@@ msgstr "
"語法: @GPG_AGENT@ [選項] [指令 [引數]]\n"
"@GNUPG@ 私鑰管理\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:434
++#: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
++#: dirmngr/dirmngr.c:421
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "給定的除錯等級 '%s' 無效\n"
- #: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
- #: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
- #: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
- #, c-format
- msgid "%s is too old (need %s, have %s)\n"
- msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
-
- #: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
- #: dirmngr/dirmngr.c:893
++#: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
++#: dirmngr/dirmngr.c:775
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "請注意: 沒有預設選項檔 '%s'\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
- #: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
- #: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
++#: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
++#: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
++#: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
#, c-format
msgid "option file '%s': %s\n"
msgstr "選項檔 '%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
- #: dirmngr/dirmngr.c:906
++#: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
++#: dirmngr/dirmngr.c:788
#, c-format
msgid "reading options from '%s'\n"
msgstr "從 '%s' 讀取選項中\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
++#: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
++#: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "請注意: '%s' 並不當成選項\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
#, c-format
msgid "can't create socket: %s\n"
msgstr "無法建立 socket: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "socket 名稱 '%s' 太長\n"
- #: agent/gpg-agent.c:1844
++#: agent/gpg-agent.c:1843
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
msgid "error getting nonce for the socket\n"
msgstr "為 socket 取得 nonce 時出錯\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "綁定 socket 至 '%s' 時出錯: %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
- #: dirmngr/dirmngr.c:1187
++#: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
++#: dirmngr/dirmngr.c:1065
#, 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:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() 失敗: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
#, c-format
msgid "listening on socket '%s'\n"
msgstr "正在候聽 socket '%s'\n"
- #: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
++#: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "無法建立目錄 '%s': %s\n"
- #: agent/gpg-agent.c:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
++#: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "目錄 '%s' 已建立\n"
- #: agent/gpg-agent.c:1954
++#: agent/gpg-agent.c:1953
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "'%s' 的 stat() 失敗: %s\n"
- #: agent/gpg-agent.c:1958
++#: agent/gpg-agent.c:1957
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "無法使用 '%s' 做為家目錄\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
@@@ -636,28 -477,22 +628,28 @@@ msgstr "經手程式 0x%lx (用於 fd %
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
- #: agent/gpg-agent.c:2385
++#: agent/gpg-agent.c:2387
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
- #: agent/gpg-agent.c:2390
++#: agent/gpg-agent.c:2392
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
++#: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s 已停止\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
++#: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "在此階段中沒有執行中的 gpg-agent\n"
@@@ -673,8 -506,6 +665,8 @@@ msgstr "
"語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
"密碼快取維護\n"
- #: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
++#: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
msgid ""
"@Commands:\n"
" "
@@@ -682,9 -513,6 +674,9 @@@ msgstr "
"@指令:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:87 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:88 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -706,21 -532,17 +698,21 @@@ msgstr "
"語法: gpg-protect-tool [選項] [引數]\n"
"私鑰維護工具\n"
- #: agent/protect-tool.c:700
++#: agent/protect-tool.c:693
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "請輸入密語來取消 PKCS#12 物件的保護."
- #: agent/protect-tool.c:705
++#: agent/protect-tool.c:698
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "請輸入密語來保護新的 PKCS#12 物件."
- #: agent/protect-tool.c:711
++#: agent/protect-tool.c:704
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr "請輸入密語以保護匯入至 GnuPG 系統內的物件."
- #: agent/protect-tool.c:716
++#: agent/protect-tool.c:709
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -728,16 -550,13 +720,16 @@@ msgstr "
"請輸入完成這項操作所需的\n"
"密語或個人識別碼 (PIN)."
- #: agent/protect-tool.c:727 tools/symcryptrun.c:454
++#: agent/protect-tool.c:720 tools/symcryptrun.c:450
msgid "cancelled\n"
msgstr "已取消\n"
- #: agent/protect-tool.c:729 tools/symcryptrun.c:450
++#: agent/protect-tool.c:722 tools/symcryptrun.c:446
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "詢問密語時出錯: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1579
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
#, c-format
msgid "error opening '%s': %s\n"
msgstr "開啟 '%s' 時出錯: %s\n"
@@@ -904,43 -694,31 +896,43 @@@ msgstr "保護演算法 %d (%s) 未支�
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "保護雜湊演算法 %d (%s) 未支援\n"
- #: common/exechelp-posix.c:361 common/exechelp-w32.c:406
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "建立管道時出錯: %s\n"
- #: common/exechelp-posix.c:374 common/exechelp-w32.c:416
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "建立管道串流時出錯: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:572
- #: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
++#: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
#, c-format
msgid "error forking process: %s\n"
msgstr "衍生執行程序時出錯: %s\n"
- #: common/exechelp-posix.c:628 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:626 common/exechelp-w32.c:734
#, fuzzy, c-format
#| msgid "waiting for process %d to terminate failed: %s\n"
msgid "waiting for processes to terminate failed: %s\n"
msgstr "等候 %d 處理程序終止時失敗: %s\n"
- #: common/exechelp-posix.c:652
++#: common/exechelp-posix.c:650
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr "執行 '%s' 時出錯: 可能尚未安裝\n"
- #: common/exechelp-posix.c:659 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:657 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "執行 '%s' 時出錯: 結束狀態 %d\n"
- #: common/exechelp-posix.c:667
++#: common/exechelp-posix.c:665
#, c-format
msgid "error running '%s': terminated\n"
msgstr "執行 '%s' 時出錯: 已終止\n"
@@@ -955,34 -731,13 +947,16 @@@ msgstr "取得 %d 執行程序結束碼
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "等候 %d 處理程序終止時失敗: %s\n"
- #: common/simple-pwquery.c:379
++#: common/simple-pwquery.c:268
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "無法連接至 '%s': %s\n"
- #: common/simple-pwquery.c:391
- msgid "communication problem with gpg-agent\n"
- msgstr "與 gpg-agent 的溝通問題\n"
-
- #: common/simple-pwquery.c:401
++#: common/simple-pwquery.c:278
msgid "problem setting the gpg-agent options\n"
msgstr "設定 gpg-agent 選項時發生問題\n"
- #: common/simple-pwquery.c:564 common/simple-pwquery.c:669
- msgid "canceled by user\n"
- msgstr "由使用者取消\n"
-
- #: common/simple-pwquery.c:579
- msgid "problem with the agent\n"
- msgstr "代理程式的問題\n"
-
- #: common/simple-pwquery.c:701
- #, fuzzy, c-format
- #| msgid "problem with the agent: %s\n"
- msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr "代理程式的問題: %s\n"
-
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "無法讓系統停止傾印核心檔: %s\n"
@@@ -1067,7 -805,6 +1041,7 @@@ msgstr "%s:%u: 廢棄的 \"%s\" 選項
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "警告: \"%s%s\" 是已廢棄的選項 - 沒有效果\n"
- #: common/miscellaneous.c:490
++#: common/miscellaneous.c:554
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1092,17 -825,14 +1066,17 @@@ msgstr "至代理程式的連線已建�
msgid "connection to agent is in restricted mode\n"
msgstr "至代理程式的連線已建立\n"
- #: common/asshelp.c:606
++#: common/asshelp.c:582
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
msgstr "沒有執行中的 Dirmngr - 正在啟動 '%s'\n"
- #: common/asshelp.c:663
++#: common/asshelp.c:630
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
msgstr "正在等候 dirmngr 出現 ... (%d 秒)\n"
- #: common/asshelp.c:672
++#: common/asshelp.c:639
msgid "connection to the dirmngr established\n"
msgstr "連線至 dirmngr 已建立\n"
@@@ -1360,7 -1030,6 +1334,7 @@@ msgstr "\"%.50s\" 選項不明確\n
msgid "command \"%.50s\" is ambiguous\n"
msgstr "\"%.50s\" 指令不明確\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1234
++#: common/argparse.c:401 dirmngr/dirmngr.c:1112
msgid "out of core\n"
msgstr "超出核心\n"
@@@ -1418,7 -1076,10 +1392,13 @@@ msgstr "未鎖定 '%s': %s\n
msgid "waiting for lock %s...\n"
msgstr "正在等候 `%s' 鎖定...\n"
++#: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
++#: dirmngr/dirmngr.c:688
+ #, c-format
+ msgid "%s is too old (need %s, have %s)\n"
+ msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
+
+#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "封裝: %s\n"
@@@ -1652,10 -1258,6 +1632,10 @@@ msgstr "取回公鑰的 URL:
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
- #: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
++#: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1617
++#: dirmngr/dirmngr.c:1441
#, c-format
msgid "error reading '%s': %s\n"
msgstr "讀取 '%s' 時出錯: %s\n"
@@@ -1940,26 -1477,17 +1920,26 @@@ msgstr "未允許使用管理者指令\
msgid "Invalid command (try \"help\")\n"
msgstr "無效的指令 (試試看 \"help\")\n"
- #: g10/decrypt.c:191 g10/encrypt.c:956
++#: g10/decrypt.c:191 g10/encrypt.c:955
msgid "--output doesn't work for this command\n"
msgstr "--output 在這個指令中沒有作用\n"
- #: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "無法開啟 '%s'\n"
+#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
+#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
+#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "找不到金鑰 \"%s\": %s\n"
+#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
+#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "讀取金鑰區塊時出錯: %s\n"
@@@ -2017,59 -1533,48 +1997,59 @@@ msgstr "公鑰 \"%s\" 有相對應的�
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
- #: g10/encrypt.c:233 g10/sign.c:1277
++#: g10/encrypt.c:232 g10/sign.c:1292
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "建立密語時出錯: %s\n"
- #: g10/encrypt.c:240
++#: g10/encrypt.c:239
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "因處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
- #: g10/encrypt.c:254
++#: g10/encrypt.c:253
#, c-format
msgid "using cipher %s\n"
msgstr "正在使用 %s 編密法\n"
- #: g10/encrypt.c:264 g10/encrypt.c:625
++#: g10/encrypt.c:263 g10/encrypt.c:624
#, c-format
msgid "'%s' already compressed\n"
msgstr "'%s' 已經被壓縮了\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
++#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "警告: '%s' 是個空檔案\n"
- #: g10/encrypt.c:558
++#: g10/encrypt.c:557
#, c-format
msgid "reading from '%s'\n"
msgstr "正在從 '%s' 讀取\n"
- #: g10/encrypt.c:606
++#: g10/encrypt.c:605
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
- #: g10/encrypt.c:708 g10/sign.c:969
++#: g10/encrypt.c:707 g10/sign.c:984
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設定\n"
- #: g10/encrypt.c:818
++#: g10/encrypt.c:817
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
- #: g10/encrypt.c:904
++#: g10/encrypt.c:903
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s 已加密給: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
++#: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "你不能夠將 %s 用於 %s 模式中\n"
@@@ -2168,8 -1652,6 +2148,8 @@@ msgstr "匯出時盡可能地從金鑰�
msgid " - skipped"
msgstr " - 已跳過"
- #: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:830 g10/sign.c:1133
++#: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:845 g10/sign.c:1148
#, c-format
msgid "writing to '%s'\n"
msgstr "正在寫入 '%s'\n"
@@@ -2202,8 -1677,6 +2182,8 @@@ msgstr "建立 '%s' 時出錯: %s\n
msgid "[User ID not found]"
msgstr "[找不到使用者 ID]"
+#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:971
++#: g10/pkclist.c:975
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
@@@ -2273,203 -1733,154 +2253,203 @@@ msgstr "無效的金鑰 %s 可以藉�
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子鑰 %s 來替換主鑰 %s\n"
- #: g10/gpg.c:417 sm/gpgsm.c:198
++#: g10/gpg.c:420 sm/gpgsm.c:198
msgid "make a signature"
msgstr "建立簽章"
- #: g10/gpg.c:418
++#: g10/gpg.c:421
msgid "make a clear text signature"
msgstr "建立明文簽章"
- #: g10/gpg.c:419 sm/gpgsm.c:200
++#: g10/gpg.c:422 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "建立分離式簽章"
- #: g10/gpg.c:420 sm/gpgsm.c:201
++#: g10/gpg.c:423 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "加密資料"
- #: g10/gpg.c:422
++#: g10/gpg.c:425
msgid "encryption only with symmetric cipher"
msgstr "僅使用對稱式編密法來加密"
- #: g10/gpg.c:424 sm/gpgsm.c:203
++#: g10/gpg.c:427 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "資料解密 (預設)"
- #: g10/gpg.c:426 sm/gpgsm.c:204
++#: g10/gpg.c:429 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "驗證簽章"
- #: g10/gpg.c:428 sm/gpgsm.c:205
++#: g10/gpg.c:431 sm/gpgsm.c:205
msgid "list keys"
msgstr "列出金鑰"
- #: g10/gpg.c:430
++#: g10/gpg.c:433
msgid "list keys and signatures"
msgstr "列出金鑰和簽章"
- #: g10/gpg.c:431
++#: g10/gpg.c:434
msgid "list and check key signatures"
msgstr "列出並檢查金鑰簽章"
- #: g10/gpg.c:432 sm/gpgsm.c:210
++#: g10/gpg.c:435 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "列出金鑰和指紋"
- #: g10/gpg.c:433 sm/gpgsm.c:208
++#: g10/gpg.c:436 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "列出私鑰"
- #: g10/gpg.c:435 sm/gpgsm.c:211
++#: g10/gpg.c:438 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "產生新的金鑰對"
- #: g10/gpg.c:437
++#: g10/gpg.c:440
msgid "quickly generate a new key pair"
msgstr "快速產生新的金鑰對"
- #: g10/gpg.c:439
++#: g10/gpg.c:442
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly add a new user-id"
msgstr "快速產生新的金鑰對"
- #: g10/gpg.c:442
++#: g10/gpg.c:445
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "快速產生新的金鑰對"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "full featured key pair generation"
msgstr "全能金鑰對生成"
- #: g10/gpg.c:445
++#: g10/gpg.c:448
msgid "generate a revocation certificate"
msgstr "產生撤銷憑證"
- #: g10/gpg.c:447 sm/gpgsm.c:213
++#: g10/gpg.c:450 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "從公鑰鑰匙圈裡移除金鑰"
- #: g10/gpg.c:449
++#: g10/gpg.c:452
msgid "remove keys from the secret keyring"
msgstr "從私鑰鑰匙圈裡移除金鑰"
- #: g10/gpg.c:451
++#: g10/gpg.c:454
msgid "quickly sign a key"
msgstr "快速簽署金鑰"
- #: g10/gpg.c:453
++#: g10/gpg.c:456
msgid "quickly sign a key locally"
msgstr "快速在本機簽署金鑰"
- #: g10/gpg.c:454
++#: g10/gpg.c:457
msgid "sign a key"
msgstr "簽署金鑰"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "sign a key locally"
msgstr "僅在本機簽署金鑰"
- #: g10/gpg.c:456
++#: g10/gpg.c:459
msgid "sign or edit a key"
msgstr "簽署或編輯金鑰"
- #: g10/gpg.c:458 sm/gpgsm.c:231
++#: g10/gpg.c:461 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "更改密語"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "export keys"
msgstr "匯出金鑰"
- #: g10/gpg.c:461
++#: g10/gpg.c:464
msgid "export keys to a keyserver"
msgstr "把金鑰匯出至金鑰伺服器"
- #: g10/gpg.c:462
++#: g10/gpg.c:465
msgid "import keys from a keyserver"
msgstr "從金鑰伺服器匯入金鑰"
- #: g10/gpg.c:464
++#: g10/gpg.c:467
msgid "search for keys on a keyserver"
msgstr "在金鑰伺服器上搜尋金鑰"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "update all keys from a keyserver"
msgstr "從金鑰伺服器更新所有的金鑰"
- #: g10/gpg.c:472
++#: g10/gpg.c:475
msgid "import/merge keys"
msgstr "匯入/合併金鑰"
- #: g10/gpg.c:475
++#: g10/gpg.c:478
msgid "print the card status"
msgstr "列印卡片狀態"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "change data on a card"
msgstr "變更卡片上的資料"
- #: g10/gpg.c:477
++#: g10/gpg.c:480
msgid "change a card's PIN"
msgstr "變更卡片的個人識別碼 (PIN)"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "update the trust database"
msgstr "更新信任資料庫"
- #: g10/gpg.c:498
++#: g10/gpg.c:501
msgid "print message digests"
msgstr "印出訊息摘要"
- #: g10/gpg.c:501 sm/gpgsm.c:226
++#: g10/gpg.c:504 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "以伺服器模式執行"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:507 sm/gpgsm.c:244
++#: g10/gpg.c:510 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "建立以 ASCII 封裝過的輸出"
- #: g10/gpg.c:510 sm/gpgsm.c:260
++#: g10/gpg.c:513 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|使用者-ID|以指定使用者 ID 作為加密對象"
- #: g10/gpg.c:526 sm/gpgsm.c:296
++#: g10/gpg.c:529 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
- #: g10/gpg.c:531
++#: g10/gpg.c:535
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
- #: g10/gpg.c:538
++#: g10/gpg.c:542
msgid "use canonical text mode"
msgstr "使用標準的文字模式"
- #: g10/gpg.c:555 sm/gpgsm.c:298
++#: g10/gpg.c:559 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|檔案|將輸出寫入至指定檔案"
- #: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
msgid "do not make any changes"
msgstr "不要做任何改變"
- #: g10/gpg.c:570
++#: g10/gpg.c:575
msgid "prompt before overwriting"
msgstr "覆寫前先詢問"
- #: g10/gpg.c:618
++#: g10/gpg.c:623
msgid "use strict OpenPGP behavior"
msgstr "使用嚴謹的 OpenPGP 行為"
- #: g10/gpg.c:644 sm/gpgsm.c:353
++#: g10/gpg.c:649 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2477,7 -1888,6 +2457,7 @@@ msgstr "
"@\n"
"(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
- #: g10/gpg.c:647 sm/gpgsm.c:356
++#: g10/gpg.c:652 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2497,11 -1907,9 +2477,11 @@@ msgstr "
" --list-keys [名字] 顯示金鑰\n"
" --fingerprint [名字] 顯示指紋\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1018
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "用法: @GPG@ [選項] [檔案] (或用 -h 求助)"
- #: g10/gpg.c:1016
++#: g10/gpg.c:1021
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2511,7 -1919,6 +2491,7 @@@ msgstr "
"簽署, 檢查, 加密, 解密\n"
"預設的操作會依輸入資料而定\n"
- #: g10/gpg.c:1027 sm/gpgsm.c:585
++#: g10/gpg.c:1032 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2519,586 -1926,452 +2499,581 @@@ msgstr "
"\n"
"已支援的演算法:\n"
- #: g10/gpg.c:1030
++#: g10/gpg.c:1035
msgid "Pubkey: "
msgstr "公鑰: "
- #: g10/gpg.c:1037 g10/keyedit.c:3389
++#: g10/gpg.c:1042 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "編密法: "
- #: g10/gpg.c:1044
++#: g10/gpg.c:1049
msgid "Hash: "
msgstr "雜湊: "
- #: g10/gpg.c:1051 g10/keyedit.c:3438
++#: g10/gpg.c:1056 g10/keyedit.c:3438
msgid "Compression: "
msgstr "壓縮: "
- #: g10/gpg.c:1120 sm/gpgsm.c:659
++#: g10/gpg.c:1125 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "用法: %s [選項] %s\n"
- #: g10/gpg.c:1308 sm/gpgsm.c:748
++#: g10/gpg.c:1313 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "指令彼此矛盾\n"
- #: g10/gpg.c:1326
++#: g10/gpg.c:1331
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "在群組定義 '%s' 裡找不到 = 記號\n"
- #: g10/gpg.c:1524
++#: g10/gpg.c:1529
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的所有權並不安全\n"
- #: g10/gpg.c:1527
++#: g10/gpg.c:1532
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的所有權並不安全\n"
- #: g10/gpg.c:1530
++#: g10/gpg.c:1535
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的所有權並不安全\n"
- #: g10/gpg.c:1536
++#: g10/gpg.c:1541
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的權限並不安全\n"
- #: g10/gpg.c:1539
++#: g10/gpg.c:1544
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的權限並不安全\n"
- #: g10/gpg.c:1542
++#: g10/gpg.c:1547
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的權限並不安全\n"
- #: g10/gpg.c:1548
++#: g10/gpg.c:1553
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1551
++#: g10/gpg.c:1556
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1554
++#: g10/gpg.c:1559
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1565
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1568
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1773
++#: g10/gpg.c:1778
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "未知的組態項目 '%s'\n"
- #: g10/gpg.c:1880
++#: g10/gpg.c:1885
msgid "display photo IDs during key listings"
msgstr "列出金鑰時顯示照片 ID"
- #: g10/gpg.c:1882
++#: g10/gpg.c:1887
msgid "show key usage information during key listings"
msgstr "列出金鑰時顯示金鑰用途資訊"
- #: g10/gpg.c:1884
++#: g10/gpg.c:1889
msgid "show policy URLs during signature listings"
msgstr "列出簽章時顯示原則 URL"
- #: g10/gpg.c:1886
++#: g10/gpg.c:1891
msgid "show all notations during signature listings"
msgstr "列出簽章時顯示所有的註記"
- #: g10/gpg.c:1888
++#: g10/gpg.c:1893
msgid "show IETF standard notations during signature listings"
msgstr "列出簽章時顯示 IETF 標準註記"
- #: g10/gpg.c:1892
++#: g10/gpg.c:1897
msgid "show user-supplied notations during signature listings"
msgstr "列出簽章時顯示使用者提供的註記"
- #: g10/gpg.c:1894
++#: g10/gpg.c:1899
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
- #: g10/gpg.c:1896
++#: g10/gpg.c:1901
msgid "show user ID validity during key listings"
msgstr "列出金鑰時顯示使用者 ID 有效性"
- #: g10/gpg.c:1898
++#: g10/gpg.c:1903
msgid "show revoked and expired user IDs in key listings"
msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
- #: g10/gpg.c:1900
++#: g10/gpg.c:1905
msgid "show revoked and expired subkeys in key listings"
msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
- #: g10/gpg.c:1902
++#: g10/gpg.c:1907
msgid "show the keyring name in key listings"
msgstr "在金鑰清單中顯示鑰匙圈名稱"
- #: g10/gpg.c:1904
++#: g10/gpg.c:1909
msgid "show expiration dates during signature listings"
msgstr "列出簽章時顯示有效期限"
- #: g10/gpg.c:2006
++#: g10/gpg.c:2011
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "可用金鑰:\n"
- #: g10/gpg.c:2017
++#: g10/gpg.c:2022
#, fuzzy, c-format
#| msgid "unknown option '%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "未知的選項 '%s'\n"
- #: g10/gpg.c:2019 g10/gpg.c:2043
++#: g10/gpg.c:2024
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2041
- #, fuzzy, c-format
- #| msgid "unknown command '%s'\n"
- msgid "unknown TOFU DB format '%s'\n"
- msgstr "未知的指令 '%s'\n"
-
- #: g10/gpg.c:2109
++#: g10/gpg.c:2088
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
- #: g10/gpg.c:2208
- #, c-format
- msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr "libgcrypt 太舊了 (需要 %s, 但是祇有 %s)\n"
-
- #: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
++#: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "請注意: 一般情況下不採用 %s!\n"
- #: g10/gpg.c:2907 g10/gpg.c:2919
++#: g10/gpg.c:2883 g10/gpg.c:2895
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s' 不是有效的簽章使用期限\n"
- #: g10/gpg.c:2960 sm/gpgsm.c:1166
++#: g10/gpg.c:2917
+ #, fuzzy, c-format
+ #| msgid "line %d: not a valid email address\n"
+ msgid "\"%s\" is not a proper mail address\n"
+ msgstr "第 %d 列: 不是有效的電子郵件地址\n"
+
++#: g10/gpg.c:2949 sm/gpgsm.c:1163
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "無效的個人識別碼項目模式 '%s'\n"
- #: g10/gpg.c:3013
++#: g10/gpg.c:3002
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "'%s' 不是有效的字元集\n"
- #: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
++#: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "無法剖析金鑰伺服器 URL\n"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3042
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: 無效的金鑰伺服器選項\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3045
msgid "invalid keyserver options\n"
msgstr "無效的金鑰伺服器選項\n"
- #: g10/gpg.c:3063
++#: g10/gpg.c:3052
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: 無效的匯入選項\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3055
msgid "invalid import options\n"
msgstr "無效的匯入選項\n"
- #: g10/gpg.c:3072 g10/gpg.c:3087
++#: g10/gpg.c:3061 g10/gpg.c:3076
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "無效的清單選項\n"
- #: g10/gpg.c:3078
++#: g10/gpg.c:3067
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: 無效的匯出選項\n"
- #: g10/gpg.c:3081
++#: g10/gpg.c:3070
msgid "invalid export options\n"
msgstr "無效的匯出選項\n"
- #: g10/gpg.c:3093
++#: g10/gpg.c:3082
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: 無效的清單選項\n"
- #: g10/gpg.c:3096
++#: g10/gpg.c:3085
msgid "invalid list options\n"
msgstr "無效的清單選項\n"
- #: g10/gpg.c:3104
++#: g10/gpg.c:3093
msgid "display photo IDs during signature verification"
msgstr "驗證簽章時顯示照片 ID"
- #: g10/gpg.c:3106
++#: g10/gpg.c:3095
msgid "show policy URLs during signature verification"
msgstr "驗證簽章時顯示原則 URL"
- #: g10/gpg.c:3108
++#: g10/gpg.c:3097
msgid "show all notations during signature verification"
msgstr "驗證簽章時顯示所有的註記"
- #: g10/gpg.c:3110
++#: g10/gpg.c:3099
msgid "show IETF standard notations during signature verification"
msgstr "驗證簽章時顯示 IETF 標準註記"
- #: g10/gpg.c:3114
++#: g10/gpg.c:3103
msgid "show user-supplied notations during signature verification"
msgstr "驗證簽章時顯示使用者提供的註記"
- #: g10/gpg.c:3116
++#: g10/gpg.c:3105
msgid "show preferred keyserver URLs during signature verification"
msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
- #: g10/gpg.c:3118
++#: g10/gpg.c:3107
msgid "show user ID validity during signature verification"
msgstr "驗證簽章時顯示使用者 ID 有效性"
- #: g10/gpg.c:3120
++#: g10/gpg.c:3109
msgid "show revoked and expired user IDs in signature verification"
msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
- #: g10/gpg.c:3122
++#: g10/gpg.c:3111
msgid "show only the primary user ID in signature verification"
msgstr "驗證簽章時祇顯示主要的使用者 ID"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3113
msgid "validate signatures with PKA data"
msgstr "以 PKA 資料驗證簽章"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3115
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提高對持有有效 PKA 資料之簽章的信任"
- #: g10/gpg.c:3133
++#: g10/gpg.c:3122
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: 無效的驗證選項\n"
- #: g10/gpg.c:3136
++#: g10/gpg.c:3125
msgid "invalid verify options\n"
msgstr "無效的驗證選項\n"
- #: g10/gpg.c:3143
++#: g10/gpg.c:3132
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "無法把執行檔路徑設成 %s\n"
- #: g10/gpg.c:3330
++#: g10/gpg.c:3319
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: 無效的自動金鑰定址清單\n"
- #: g10/gpg.c:3333
++#: g10/gpg.c:3322
msgid "invalid auto-key-locate list\n"
msgstr "無效的自動金鑰定址清單\n"
- #: g10/gpg.c:3466 sm/gpgsm.c:1503
++#: g10/gpg.c:3455 sm/gpgsm.c:1500
msgid "WARNING: program may create a core file!\n"
msgstr "警告: 程式可能會傾印出核心檔!\n"
- #: g10/gpg.c:3477
++#: g10/gpg.c:3466
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告: %s 會推翻 %s\n"
- #: g10/gpg.c:3486
++#: g10/gpg.c:3475
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不允許跟 %s 併用!\n"
- #: g10/gpg.c:3489
++#: g10/gpg.c:3478
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 跟 %s 放在一起沒有意義!\n"
- #: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
msgid "WARNING: running with faked system time: "
msgstr "警告: 正在偽造的系統時間中執行: "
- #: g10/gpg.c:3525
++#: g10/gpg.c:3514
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
- #: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
++#: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
msgid "selected cipher algorithm is invalid\n"
msgstr "所選的編密演算法無效\n"
- #: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
msgid "selected digest algorithm is invalid\n"
msgstr "所選的摘要演算法無效\n"
- #: g10/gpg.c:3572
++#: g10/gpg.c:3561
msgid "selected compression algorithm is invalid\n"
msgstr "所選的壓縮演算法無效\n"
- #: g10/gpg.c:3578
++#: g10/gpg.c:3567
msgid "selected certification digest algorithm is invalid\n"
msgstr "所選的憑證摘要演算法無效\n"
- #: g10/gpg.c:3593
++#: g10/gpg.c:3582
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed 一定要大於 0\n"
- #: g10/gpg.c:3595
++#: g10/gpg.c:3584
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed 一定要大於 1\n"
- #: g10/gpg.c:3597
++#: g10/gpg.c:3586
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
- #: g10/gpg.c:3599
++#: g10/gpg.c:3588
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
- #: g10/gpg.c:3601
++#: g10/gpg.c:3590
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
- #: g10/gpg.c:3604
++#: g10/gpg.c:3593
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "請注意: 強烈不建議使用單純 S2K 模式 (0)\n"
- #: g10/gpg.c:3608
++#: g10/gpg.c:3597
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
- #: g10/gpg.c:3615
++#: g10/gpg.c:3604
msgid "invalid default preferences\n"
msgstr "無效的預設偏好\n"
- #: g10/gpg.c:3619
++#: g10/gpg.c:3608
msgid "invalid personal cipher preferences\n"
msgstr "無效的個人編密法偏好\n"
- #: g10/gpg.c:3623
++#: g10/gpg.c:3612
msgid "invalid personal digest preferences\n"
msgstr "無效的個人摘要偏好\n"
- #: g10/gpg.c:3627
++#: g10/gpg.c:3616
msgid "invalid personal compress preferences\n"
msgstr "無效的個人壓縮偏好\n"
- #: g10/gpg.c:3663
++#: g10/gpg.c:3652
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 還沒辦法跟 %s 一起運作\n"
- #: g10/gpg.c:3710
++#: g10/gpg.c:3699
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
- #: g10/gpg.c:3715
++#: g10/gpg.c:3704
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "你不該將 '%s' 摘要演算法用於 %s 模式\n"
- #: g10/gpg.c:3720
++#: g10/gpg.c:3709
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "你不該將 '%s' 壓縮演算法用於 %s 模式\n"
- #: g10/gpg.c:3814
++#: g10/gpg.c:3803
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "信任資料庫啟始失敗: %s\n"
- #: g10/gpg.c:3826
++#: g10/gpg.c:3815
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
- #: g10/gpg.c:3883
++#: g10/gpg.c:3872
msgid "--store [filename]"
msgstr "--store [檔名]"
- #: g10/gpg.c:3893
++#: g10/gpg.c:3882
msgid "--symmetric [filename]"
msgstr "--symmetric [檔名]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3886
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "'%s' 對稱式加密失敗: %s\n"
- #: g10/gpg.c:3908
++#: g10/gpg.c:3897
msgid "--encrypt [filename]"
msgstr "--encrypt [檔名]"
- #: g10/gpg.c:3924
++#: g10/gpg.c:3913
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [檔名]"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3915
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
- #: g10/gpg.c:3929
++#: g10/gpg.c:3918
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
- #: g10/gpg.c:3950
++#: g10/gpg.c:3939
msgid "--sign [filename]"
msgstr "--sign [檔名]"
- #: g10/gpg.c:3966
++#: g10/gpg.c:3955
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [檔名]"
- #: g10/gpg.c:3984
++#: g10/gpg.c:3973
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [檔名]"
- #: g10/gpg.c:3986
++#: g10/gpg.c:3975
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
- #: g10/gpg.c:3989
++#: g10/gpg.c:3978
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
- #: g10/gpg.c:4013
++#: g10/gpg.c:4002
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [檔名]"
- #: g10/gpg.c:4025
++#: g10/gpg.c:4014
msgid "--clearsign [filename]"
msgstr "--clearsign [檔名]"
- #: g10/gpg.c:4055
++#: g10/gpg.c:4044
msgid "--decrypt [filename]"
msgstr "--decrypt [檔名]"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4071
msgid "--sign-key user-id"
msgstr "--sign-key 使用者ID"
- #: g10/gpg.c:4086
++#: g10/gpg.c:4075
msgid "--lsign-key user-id"
msgstr "--lsign-key 使用者ID"
- #: g10/gpg.c:4107
++#: g10/gpg.c:4096
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 使用者ID [指令]"
- #: g10/gpg.c:4123
++#: g10/gpg.c:4112
msgid "--passwd <user-id>"
msgstr "--passwd 使用者ID"
- #: g10/gpg.c:4319 g10/keyserver.c:1833
++#: g10/gpg.c:4308 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "送至金鑰伺服器失敗: %s\n"
- #: g10/gpg.c:4324
++#: g10/gpg.c:4313
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "從金鑰伺服器接收失敗: %s\n"
- #: g10/gpg.c:4330
++#: g10/gpg.c:4319
#, c-format
msgid "key export failed: %s\n"
msgstr "金鑰匯出失敗: %s\n"
- #: g10/gpg.c:4343
++#: g10/gpg.c:4332
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "金鑰匯出失敗: %s\n"
- #: g10/gpg.c:4355
++#: g10/gpg.c:4344
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "用金鑰伺服器搜尋失敗: %s\n"
- #: g10/gpg.c:4368
++#: g10/gpg.c:4357
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "從金鑰伺服器更新失敗: %s\n"
- #: g10/gpg.c:4435
++#: g10/gpg.c:4424
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解開封裝失敗: %s\n"
- #: g10/gpg.c:4446
++#: g10/gpg.c:4435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "進行封裝失敗: %s\n"
- #: g10/gpg.c:4538
++#: g10/gpg.c:4527
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "無效的雜湊演算法 '%s'\n"
- #: g10/gpg.c:4682
++#: g10/gpg.c:4671
#, fuzzy, c-format
#| msgid "error loading certificate '%s': %s\n"
msgid "error parsing key specification '%s': %s\n"
msgstr "載入憑證 '%s' 時出錯: %s\n"
- #: g10/gpg.c:4694
++#: g10/gpg.c:4683
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4740
++#: g10/gpg.c:4729
msgid "[filename]"
msgstr "[檔名]"
- #: g10/gpg.c:4746
++#: g10/gpg.c:4735
msgid "Go ahead and type your message ...\n"
msgstr "請開始輸入你的訊息 ...\n"
- #: g10/gpg.c:5084
++#: g10/gpg.c:5073
msgid "the given certification policy URL is invalid\n"
msgstr "給定的的憑證原則 URL 無效\n"
- #: g10/gpg.c:5086
++#: g10/gpg.c:5075
msgid "the given signature policy URL is invalid\n"
msgstr "給定的簽章原則 URL 無效\n"
- #: g10/gpg.c:5119
++#: g10/gpg.c:5108
msgid "the given preferred keyserver URL is invalid\n"
msgstr "給定的偏好金鑰伺服器 URL 無效\n"
@@@ -3139,325 -2404,259 +3114,325 @@@ msgstr "沒有可用的說明
msgid "No help available for '%s'"
msgstr "'%s' 沒有可用的說明"
- #: g10/import.c:134
++#: g10/import.c:138
msgid "import signatures that are marked as local-only"
msgstr "匯入標記為僅限本機使用的簽章"
- #: g10/import.c:137
++#: g10/import.c:141
msgid "repair damage from the pks keyserver during import"
msgstr "匯入時修復來自 pks 金鑰伺服器的損壞"
- #: g10/import.c:140
++#: g10/import.c:144
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "匯入後不要更新信任資料庫"
- #: g10/import.c:143
++#: g10/import.c:147
msgid "do not update the trustdb after import"
msgstr "匯入後不要更新信任資料庫"
- #: g10/import.c:146
++#: g10/import.c:150
#, fuzzy
#| msgid "show key fingerprint"
msgid "show key during import"
msgstr "顯示金鑰指紋"
- #: g10/import.c:149
++#: g10/import.c:153
msgid "only accept updates to existing keys"
msgstr "祇接受既有金鑰的更新"
- #: g10/import.c:152
++#: g10/import.c:156
msgid "remove unusable parts from key after import"
msgstr "匯入後從金鑰中移除無法使用的部分"
- #: g10/import.c:155
++#: g10/import.c:159
msgid "remove as much as possible from key after import"
msgstr "匯入後盡可能地從金鑰中移除"
- #: g10/import.c:158
++#: g10/import.c:162
msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:277 g10/import.c:519
++#: g10/import.c:283 g10/import.c:525
#, c-format
msgid "skipping block of type %d\n"
msgstr "正在跳過 %d 型態的區塊\n"
- #: g10/import.c:536
++#: g10/import.c:542
#, c-format
msgid "%lu keys processed so far\n"
msgstr "目前已處理 %lu 把金鑰\n"
- #: g10/import.c:606
++#: g10/import.c:612
#, c-format
msgid "Total number processed: %lu\n"
msgstr "處理總量: %lu\n"
- #: g10/import.c:609
++#: g10/import.c:615
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " 已跳過的新金鑰: %lu\n"
- #: g10/import.c:611
++#: g10/import.c:617
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " 已跳過的新金鑰: %lu\n"
- #: g10/import.c:614
++#: g10/import.c:620
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " 沒有使用者的 ID: %lu\n"
- #: g10/import.c:617 sm/import.c:130
++#: g10/import.c:623 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " 已匯入: %lu"
- #: g10/import.c:621 sm/import.c:134
++#: g10/import.c:627 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " 未改變的: %lu\n"
- #: g10/import.c:623
++#: g10/import.c:629
#, c-format
msgid " new user IDs: %lu\n"
msgstr " 新的使用者 ID: %lu\n"
- #: g10/import.c:625
++#: g10/import.c:631
#, c-format
msgid " new subkeys: %lu\n"
msgstr " 新的子鑰: %lu\n"
- #: g10/import.c:627
++#: g10/import.c:633
#, c-format
msgid " new signatures: %lu\n"
msgstr " 新的簽章: %lu\n"
- #: g10/import.c:629
++#: g10/import.c:635
#, c-format
msgid " new key revocations: %lu\n"
msgstr " 新的金鑰撤銷: %lu\n"
- #: g10/import.c:631 sm/import.c:136
++#: g10/import.c:637 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " 已讀取的私鑰: %lu\n"
- #: g10/import.c:633 sm/import.c:138
++#: g10/import.c:639 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " 已匯入的私鑰: %lu\n"
- #: g10/import.c:635 sm/import.c:140
++#: g10/import.c:641 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " 未改變的私鑰: %lu\n"
- #: g10/import.c:637 sm/import.c:142
++#: g10/import.c:643 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " 未被匯入: %lu\n"
- #: g10/import.c:639
++#: g10/import.c:645
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " 已清除的簽章: %lu\n"
- #: g10/import.c:641
++#: g10/import.c:647
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " 已清除的使用者 ID: %lu\n"
- #: g10/import.c:985
++#: g10/import.c:991
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr "警告: 金鑰 %s 的偏好設定含有這些使用者 ID 無法使用的演算法:\n"
- #: g10/import.c:1027
++#: g10/import.c:1033
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": 編密演算法 %s 的偏好設定\n"
- #: g10/import.c:1042
++#: g10/import.c:1048
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": 摘要演算法 %s 的偏好設定\n"
- #: g10/import.c:1054
++#: g10/import.c:1060
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": 壓縮演算法 %s 的偏好設定\n"
- #: g10/import.c:1067
++#: g10/import.c:1073
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "我們強烈建議你更新偏好設定, 並重新\n"
- #: g10/import.c:1069
++#: g10/import.c:1075
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
- #: g10/import.c:1094
++#: g10/import.c:1100
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "你可以像這樣來更新偏好設定: gpg --edit-key %s updpref save\n"
- #: g10/import.c:1227 g10/import.c:1998
++#: g10/import.c:1306 g10/import.c:2082
#, c-format
msgid "key %s: no user ID\n"
msgstr "金鑰 %s: 沒有使用者 ID\n"
- #: g10/import.c:1233
++#: g10/import.c:1312
#, c-format
msgid "key %s: %s\n"
msgstr "金鑰 %s: %s\n"
- #: g10/import.c:1234 g10/import.c:1972
++#: g10/import.c:1313 g10/import.c:2056
msgid "rejected by import screener"
msgstr "遭到匯入篩選程式駁回"
- #: g10/import.c:1264
++#: g10/import.c:1343
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
- #: g10/import.c:1282
++#: g10/import.c:1361
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "金鑰 %s: 已接受非自我簽署的使用者 ID \"%s\"\n"
- #: g10/import.c:1292
++#: g10/import.c:1371
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
- #: g10/import.c:1294
++#: g10/import.c:1373
msgid "this may be caused by a missing self-signature\n"
msgstr "這可能肇因於遺失自我簽章所致\n"
- #: g10/import.c:1347 g10/import.c:2140
++#: g10/import.c:1431 g10/import.c:2233
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "金鑰 %s: 找不到公鑰: %s\n"
- #: g10/import.c:1353
++#: g10/import.c:1437
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
- #: g10/import.c:1368
++#: g10/import.c:1452
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "找不到可寫入的鑰匙圈: %s\n"
- #: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
++#: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "寫入鑰匙圈 '%s' 時出錯: %s\n"
- #: g10/import.c:1397
++#: g10/import.c:1481
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
- #: g10/import.c:1421
++#: g10/import.c:1505
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "金鑰 %s: 跟我們的副本不吻合\n"
- #: g10/import.c:1437 g10/import.c:2164
++#: g10/import.c:1521 g10/import.c:2257
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
- #: g10/import.c:1445 g10/import.c:2171
++#: g10/import.c:1529 g10/import.c:2264
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
- #: g10/import.c:1488
++#: g10/import.c:1572
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
- #: g10/import.c:1491
++#: g10/import.c:1575
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
- #: g10/import.c:1494
++#: g10/import.c:1578
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "金鑰 %s: \"%s\" 1 份新的簽章\n"
- #: g10/import.c:1497
++#: g10/import.c:1581
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "金鑰 %s: \"%s\" %d 份新的簽章\n"
- #: g10/import.c:1500
++#: g10/import.c:1584
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "金鑰 %s: \"%s\" 1 把新的子鑰\n"
- #: g10/import.c:1503
++#: g10/import.c:1587
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "金鑰 %s: \"%s\" %d 把新的子鑰\n"
- #: g10/import.c:1506
++#: g10/import.c:1590
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
- #: g10/import.c:1509
++#: g10/import.c:1593
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
- #: g10/import.c:1512
++#: g10/import.c:1596
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
- #: g10/import.c:1515
++#: g10/import.c:1599
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
- #: g10/import.c:1538
++#: g10/import.c:1622
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "金鑰 %s: \"%s\" 未改變\n"
- #: g10/import.c:1850 g10/import.c:2092
++#: g10/import.c:1934 g10/import.c:2179
#, c-format
msgid "key %s: secret key imported\n"
msgstr "金鑰 %s: 私鑰已匯入\n"
- #: g10/import.c:1858
++#: g10/import.c:1942
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "金鑰 %s: 私鑰已存在\n"
- #: g10/import.c:1866
++#: g10/import.c:1950
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "金鑰 %s: 送至代理程式時出錯: %s\n"
- #: g10/import.c:1971
++#: g10/import.c:2055
#, c-format
msgid "secret key %s: %s\n"
msgstr "私鑰 %s: %s\n"
- #: g10/import.c:1991 g10/import.c:2026
++#: g10/import.c:2075 g10/import.c:2110
msgid "importing secret keys not allowed\n"
msgstr "未允許匯入私鑰\n"
- #: g10/import.c:2015
++#: g10/import.c:2099
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
@@@ -3472,87 -2671,70 +3447,87 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:2084
++#: g10/import.c:2171
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:2133
++#: g10/import.c:2226
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
- #: g10/import.c:2182
++#: g10/import.c:2275
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
- #: g10/import.c:2215
++#: g10/import.c:2308
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
- #: g10/import.c:2291
++#: g10/import.c:2384
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
- #: g10/import.c:2308
++#: g10/import.c:2401
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "金鑰 %s: 使用者 ID \"%s\" 用了未支援的公鑰演算法\n"
- #: g10/import.c:2310
++#: g10/import.c:2403
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
- #: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
++#: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "金鑰 %s: 未支援的公鑰演算法\n"
- #: g10/import.c:2328
++#: g10/import.c:2421
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "金鑰 %s: 無效的直接金鑰簽章\n"
- #: g10/import.c:2342
++#: g10/import.c:2435
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
- #: g10/import.c:2355
++#: g10/import.c:2448
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "金鑰 %s: 無效的附帶子鑰\n"
- #: g10/import.c:2371
++#: g10/import.c:2464
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "金鑰 %s: 多重附帶子鑰已移除\n"
- #: g10/import.c:2393
++#: g10/import.c:2486
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
- #: g10/import.c:2406
++#: g10/import.c:2499
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "金鑰 %s: 無效的子鑰撤銷\n"
- #: g10/import.c:2421
++#: g10/import.c:2514
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
- #: g10/import.c:2463
++#: g10/import.c:2556
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
- #: g10/import.c:2487
++#: g10/import.c:2580
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "金鑰 %s: 子鑰已跳過\n"
@@@ -3561,52 -2743,42 +3536,52 @@@
# * to import non-exportable signature when we have the
# * the secret key used to create this signature - it
# * seems that this makes sense
- #: g10/import.c:2516
++#: g10/import.c:2609
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
- #: g10/import.c:2527
++#: g10/import.c:2620
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
- #: g10/import.c:2545
++#: g10/import.c:2638
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
- #: g10/import.c:2559
++#: g10/import.c:2652
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
- #: g10/import.c:2567
++#: g10/import.c:2660
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
- #: g10/import.c:2696
++#: g10/import.c:2789
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
- #: g10/import.c:2760
++#: g10/import.c:2853
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
- #: g10/import.c:2776
++#: g10/import.c:2869
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
- #: g10/import.c:2840
++#: g10/import.c:2933
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
- #: g10/import.c:2878
++#: g10/import.c:2971
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
@@@ -3937,8 -3047,6 +3912,8 @@@ msgstr "我非常小心地檢查過這�
msgid "Really sign? (y/N) "
msgstr "真的要簽署嗎? (y/N)"
+#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:308
++#: g10/keyedit.c:6447 g10/sign.c:323
#, c-format
msgid "signing failed: %s\n"
msgstr "簽署時失敗: %s\n"
@@@ -4386,13 -3392,9 +4361,13 @@@ msgstr "
"請注意顯示出來的金鑰有效性不需要更正,\n"
"除非你重新執行程式.\n"
+#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
msgid "revoked"
msgstr "已撤銷"
+#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
++#: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "已過期"
@@@ -5305,33 -4129,28 +5280,33 @@@ msgstr " 金鑰指紋 =
msgid " Card serial no. ="
msgstr " 卡片序號 ="
- #: g10/keyring.c:1489
++#: g10/keyring.c:1498
#, c-format
msgid "caching keyring '%s'\n"
msgstr "快取鑰匙圈 '%s' 中\n"
- #: g10/keyring.c:1566
++#: g10/keyring.c:1572
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "目前已檢查 %lu 把金鑰 (共 %lu 份簽章)\n"
- #: g10/keyring.c:1582
++#: g10/keyring.c:1588
#, fuzzy, c-format
#| msgid "flush the cache"
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] "清除快取"
- #: g10/keyring.c:1584
++#: g10/keyring.c:1590
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
msgstr[0] "1 份損壞的簽章\n"
- #: g10/keyring.c:1659
++#: g10/keyring.c:1665
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: 鑰匙圈已建立\n"
@@@ -5544,113 -4318,94 +5519,119 @@@ msgstr "獨立撤銷 - 請用 \"gpg --i
msgid "no signature found\n"
msgstr "找不到簽章\n"
- #: g10/mainproc.c:1573
++#: g10/mainproc.c:1588
#, c-format
msgid "BAD signature from \"%s\""
msgstr "*損壞* 的簽章來自於 \"%s\""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1590
#, c-format
msgid "Expired signature from \"%s\""
msgstr "過期的簽章來自於 \"%s\""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1592
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的簽章來自於 \"%s\""
- #: g10/mainproc.c:1597
++#: g10/mainproc.c:1613
msgid "signature verification suppressed\n"
msgstr "簽章驗證已抑制\n"
- #: g10/mainproc.c:1706
++#: g10/mainproc.c:1722
msgid "can't handle this ambiguous signature data\n"
msgstr "無法處理這個不明確的簽章資料\n"
- #: g10/mainproc.c:1720
++#: g10/mainproc.c:1736 g10/mainproc.c:1744
#, c-format
msgid "Signature made %s\n"
msgstr "由 %s 建立的簽章\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1737 g10/mainproc.c:1745
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 金鑰 %s\n"
- #: g10/mainproc.c:1725
++#: g10/mainproc.c:1749
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
- #: g10/mainproc.c:1744
++#: g10/mainproc.c:1755
+ #, fuzzy, c-format
+ #| msgid " aka \"%s\""
+ msgid " issuer \"%s\"\n"
+ msgstr " 亦即 \"%s\""
+
++#: g10/mainproc.c:1772
msgid "Key available at: "
msgstr "可用的金鑰於: "
- #: g10/mainproc.c:1967
++#: g10/mainproc.c:1995
msgid "[uncertain]"
msgstr "[ 不確定 ]"
- #: g10/mainproc.c:2005
++#: g10/mainproc.c:2033
#, c-format
msgid " aka \"%s\""
msgstr " 亦即 \"%s\""
- #: g10/mainproc.c:2116
++#: g10/mainproc.c:2144
#, c-format
msgid "Signature expired %s\n"
msgstr "這份簽署已經在 %s 過期了\n"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2148
#, c-format
msgid "Signature expires %s\n"
msgstr "這份簽署將在 %s 到期\n"
- #: g10/mainproc.c:2123
++#: g10/mainproc.c:2151
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s 簽章, 摘要演算法 %s%s%s\n"
- #: g10/mainproc.c:2124
++#: g10/mainproc.c:2152
msgid "binary"
msgstr "二進制"
- #: g10/mainproc.c:2125
++#: g10/mainproc.c:2153
msgid "textmode"
msgstr "文字模式"
- #: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
msgid "unknown"
msgstr "未知"
- #: g10/mainproc.c:2127
++#: g10/mainproc.c:2155
msgid ", key algorithm "
msgstr ", 金鑰演算法 "
- #: g10/mainproc.c:2162
++#: g10/mainproc.c:2190
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2189
++#: g10/mainproc.c:2217
#, c-format
msgid "Can't check signature: %s\n"
msgstr "無法檢查簽章: %s\n"
- #: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
++#: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
msgid "not a detached signature\n"
msgstr "不是一份分離的簽章\n"
- #: g10/mainproc.c:2330
++#: g10/mainproc.c:2358
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
- #: g10/mainproc.c:2339
++#: g10/mainproc.c:2367
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等級 0x%02x 的獨立簽章\n"
- #: g10/mainproc.c:2411
++#: g10/mainproc.c:2439
msgid "old style (PGP 2.x) signature\n"
msgstr "舊型 (PGP 2.x) 簽章\n"
@@@ -5825,82 -4545,38 +5806,49 @@@ msgstr "警告: 可能並不安全的�
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 類別的子封包設定了關鍵位元\n"
- #: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
++#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
#, c-format
msgid "problem with the agent: %s\n"
msgstr "代理程式的問題: %s\n"
- #: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
- #, c-format
- msgid " (main key ID %s)"
- msgstr " (主要金鑰 ID %s)"
-
- #: g10/passphrase.c:277
- #, c-format
- msgid ""
- "Please enter the passphrase to unlock the secret key for the OpenPGP "
- "certificate:\n"
- "\"%.*s\"\n"
- "%u-bit %s key, ID %s,\n"
- "created %s%s.\n"
- msgstr ""
- "請輸入密語來解開 OpenPGP 憑證所需的私鑰:\n"
- "\"%.*s\"\n"
- "%u 位元長的 %s 金鑰, ID %s,\n"
- "建立於 %s%s.\n"
-
- #: g10/passphrase.c:296
++#: g10/passphrase.c:241
msgid "Enter passphrase\n"
msgstr "請輸入密語\n"
- #: g10/passphrase.c:325
++#: g10/passphrase.c:252
msgid "cancelled by user\n"
msgstr "由使用者所取消\n"
- #: g10/passphrase.c:483
++#: g10/passphrase.c:489
#, c-format
- msgid ""
- "You need a passphrase to unlock the secret key for\n"
- "user: \"%s\"\n"
- msgstr ""
- "你需要用密語來解開下列使用者的\n"
- "私鑰: \"%s\"\n"
-
- #: g10/passphrase.c:491
- #, c-format
- msgid "%u-bit %s key, ID %s, created %s"
- msgstr "%u 位元長的 %s 金鑰, ID %s, 建立於 %s"
-
- #: g10/passphrase.c:500
- #, c-format
- msgid " (subkey on main key ID %s)"
- msgstr " (在主鑰 ID %s 上的子鑰)"
+ msgid " (main key ID %s)"
+ msgstr " (主要金鑰 ID %s)"
- #: g10/passphrase.c:665
++#: g10/passphrase.c:496
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "請輸入密語來解鎖 OpenPGP 私鑰:"
- #: g10/passphrase.c:669
++#: g10/passphrase.c:500
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "請輸入密語來匯入 OpenPGP 私鑰:"
- #: g10/passphrase.c:674
++#: g10/passphrase.c:505
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "請輸入密語來匯出 OpenPGP 私子鑰:"
- #: g10/passphrase.c:677
++#: g10/passphrase.c:508
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "請輸入密語來匯出 OpenPGP 私鑰:"
- #: g10/passphrase.c:682
++#: g10/passphrase.c:513
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "你是否真的想要永久刪除 OpenPGP 私鑰子鑰:"
- #: g10/passphrase.c:685
++#: g10/passphrase.c:516
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "你是否真的想要永久刪除 OpenPGP 私鑰:"
- #: g10/passphrase.c:694
++#: g10/passphrase.c:525
#, c-format
msgid ""
"%s\n"
@@@ -6097,124 -4738,97 +6045,124 @@@ msgstr "
msgid "Use this key anyway? (y/N) "
msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
- #: g10/pkclist.c:545
++#: g10/pkclist.c:549
msgid "WARNING: Using untrusted key!\n"
msgstr "警告: 正在使用不被信任的金鑰!\n"
- #: g10/pkclist.c:552
++#: g10/pkclist.c:556
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "警告: 這把金鑰可能已撤銷 (撤銷金鑰未出現)\n"
- #: g10/pkclist.c:561
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "警告: 這把金鑰已被指定撤銷者所撤銷!\n"
- #: g10/pkclist.c:564
++#: g10/pkclist.c:568
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "警告: 這把金鑰已被其持有人所撤銷!\n"
- #: g10/pkclist.c:565
++#: g10/pkclist.c:569
msgid " This could mean that the signature is forged.\n"
msgstr " 這很有可能表示此簽章是偽造的.\n"
- #: g10/pkclist.c:571
++#: g10/pkclist.c:575
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "警告: 這把子鑰已被其持有人所撤銷!\n"
- #: g10/pkclist.c:576
++#: g10/pkclist.c:580
msgid "Note: This key has been disabled.\n"
msgstr "請注意: 這把金鑰已停用.\n"
- #: g10/pkclist.c:596
++#: g10/pkclist.c:600
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "請注意: 已驗證的簽署者地址為 '%s'\n"
- #: g10/pkclist.c:603
++#: g10/pkclist.c:607
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "請注意: 簽署者地址 '%s' 與 DNS 項目並不吻合\n"
- #: g10/pkclist.c:615
++#: g10/pkclist.c:619
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "信任等級因有效的 PKA 資訊而調整為 *完全*\n"
- #: g10/pkclist.c:623
++#: g10/pkclist.c:627
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "信任等級因不良的 PKA 資訊而調整為 *永遠不會*\n"
- #: g10/pkclist.c:634
++#: g10/pkclist.c:638
msgid "Note: This key has expired!\n"
msgstr "請注意: 這把金鑰已經過期了!\n"
- #: g10/pkclist.c:645
++#: g10/pkclist.c:649
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
- #: g10/pkclist.c:647
++#: g10/pkclist.c:651
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " 沒有證據指出這個簽章屬於這個持有者.\n"
- #: g10/pkclist.c:655
++#: g10/pkclist.c:659
msgid "WARNING: We do NOT trust this key!\n"
msgstr "警告: 我們 *不* 信任這把金鑰!\n"
- #: g10/pkclist.c:656
++#: g10/pkclist.c:660
msgid " The signature is probably a FORGERY.\n"
msgstr " 這個簽章很有可能是 *偽造的*.\n"
- #: g10/pkclist.c:664
++#: g10/pkclist.c:668
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
- #: g10/pkclist.c:666
++#: g10/pkclist.c:670
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " 這份簽章並不屬於這個持有者\n"
- #: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
++#: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: 已跳過: %s\n"
- #: g10/pkclist.c:862
++#: g10/pkclist.c:866
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: 已跳過: 公鑰已停用\n"
- #: g10/pkclist.c:881 g10/pkclist.c:1045
++#: g10/pkclist.c:885 g10/pkclist.c:1049
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: 已跳過: 公鑰已存在\n"
- #: g10/pkclist.c:969
++#: g10/pkclist.c:973
#, 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:984
++#: g10/pkclist.c:988
#, 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:991
++#: g10/pkclist.c:995
#, 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:1094
++#: g10/pkclist.c:1098
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "你沒有指定使用者 ID. (你可能得用 \"-r\")\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1122
msgid "Current recipients:\n"
msgstr "目前的收件者:\n"
- #: g10/pkclist.c:1144
++#: g10/pkclist.c:1148
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6222,37 -4836,29 +6170,37 @@@ msgstr "
"\n"
"請輸入使用者 ID. 以空白列結束: "
- #: g10/pkclist.c:1168
++#: g10/pkclist.c:1172
msgid "No such user ID.\n"
msgstr "沒有這個使用者 ID.\n"
- #: g10/pkclist.c:1179 g10/pkclist.c:1255
++#: g10/pkclist.c:1183 g10/pkclist.c:1259
msgid "skipped: public key already set as default recipient\n"
msgstr "已跳過: 公鑰已經被設成預設收件者\n"
- #: g10/pkclist.c:1200
++#: g10/pkclist.c:1204
msgid "Public key is disabled.\n"
msgstr "公鑰已停用.\n"
- #: g10/pkclist.c:1210
++#: g10/pkclist.c:1214
msgid "skipped: public key already set\n"
msgstr "已跳過: 公鑰已設過\n"
- #: g10/pkclist.c:1245
++#: g10/pkclist.c:1249
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "未知的預設收件者 \"%s\"\n"
- #: g10/pkclist.c:1294
++#: g10/pkclist.c:1298
msgid "no valid addressees\n"
msgstr "沒有有效的地址\n"
- #: g10/pkclist.c:1624
++#: g10/pkclist.c:1628
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "請注意: 金鑰 %s 沒有 %s 功能\n"
- #: g10/pkclist.c:1649
++#: g10/pkclist.c:1653
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "警告: 金鑰 %s 沒有 %s 的偏好設定\n"
@@@ -6542,7 -5096,6 +6490,7 @@@ msgid "public key %s is %lu day newer t
msgid_plural "public key %s is %lu days newer than the signature\n"
msgstr[0] "公鑰 %s 比簽章還要新了 %lu 秒\n"
- #: g10/sig-check.c:300 g10/sign.c:251
++#: g10/sig-check.c:300 g10/sign.c:266
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6606,22 -5150,18 +6554,22 @@@ msgid "
"unexpanded.\n"
msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
- #: g10/sign.c:314
++#: g10/sign.c:329
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s 簽章來自: \"%s\"\n"
- #: g10/sign.c:863
++#: g10/sign.c:878
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
- #: g10/sign.c:994
++#: g10/sign.c:1009
msgid "signing:"
msgstr "簽署:"
- #: g10/sign.c:1271
++#: g10/sign.c:1286
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s 加密將被採用\n"
@@@ -6722,7 -5242,6 +6670,7 @@@ msgstr "信任資料庫更動量過大\
msgid "%s: directory does not exist!\n"
msgstr "%s: 目錄不存在!\n"
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:593
#, c-format
msgid "can't access '%s': %s\n"
msgstr "無法存取 '%s': %s\n"
@@@ -6831,151 -5328,118 +6779,143 @@@ msgstr "無法處理長於 %d 字符的
msgid "input line longer than %d characters\n"
msgstr "輸入列比 %d 字符還長\n"
- #: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
++#: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "送出標準選項時出錯: %s\n"
- #: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
++#: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:375 g10/tofu.c:715
++#: g10/tofu.c:305 g10/tofu.c:620
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:512
++#: g10/tofu.c:435
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "未支援的演算法: %s"
- #: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
- #: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
++#: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
++#: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "送出資料時出錯: %s\n"
- #: g10/tofu.c:577 g10/tofu.c:585
++#: g10/tofu.c:500 g10/tofu.c:508
#, fuzzy, c-format
#| msgid "error writing base64 encoding: %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "寫入 base64 編碼時出錯: %s\n"
- #: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
++#: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
#, fuzzy, c-format
#| msgid "error initializing reader object: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "啟始讀取程式物件時出錯: %s\n"
- #: g10/tofu.c:761
++#: g10/tofu.c:658
#, fuzzy, c-format
#| msgid "error opening '%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "開啟 '%s' 時出錯: %s\n"
- #: g10/tofu.c:1027
- msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
-
- #: g10/tofu.c:1029
- msgid "Using split format for TOFU database\n"
- msgstr ""
-
- #: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
++#: g10/tofu.c:828 g10/tofu.c:2266
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "送出資料時出錯: %s\n"
- #: g10/tofu.c:1626
++#: g10/tofu.c:1118
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1636
++#: g10/tofu.c:1128
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1648
++#: g10/tofu.c:1140
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1737
++#: g10/tofu.c:1214
#, fuzzy, c-format
#| msgid "error getting responder ID: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "取得回應程式 ID 時出錯: %s\n"
- #: g10/tofu.c:1747
++#: g10/tofu.c:1223
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
++#: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "有效性: %s"
- #: g10/tofu.c:1817
++#: g10/tofu.c:1290
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "取得已存放的旗標時出錯: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1294
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
- #: g10/tofu.c:1845
++#: g10/tofu.c:1318
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1859
++#: g10/tofu.c:1332
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "列出金鑰"
- #: g10/tofu.c:1869
++#: g10/tofu.c:1342
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
- #: g10/tofu.c:1878
++#: g10/tofu.c:1351
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "印出訊息摘要"
- #: g10/tofu.c:1884
++#: g10/tofu.c:1357
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
- #: g10/tofu.c:1888
++#: g10/tofu.c:1361
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
- #: g10/tofu.c:1892
++#: g10/tofu.c:1365
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -6984,28 -5448,23 +6924,28 @@@ msgstr[0] "
#. 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:1909
++#: g10/tofu.c:1382
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1947
++#: g10/tofu.c:1420
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1953
++#: g10/tofu.c:1426
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
++#: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
#, fuzzy, c-format
#| msgid "error setting OCSP target: %s\n"
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "設定 OCSP 目標時出錯: %s\n"
- #: g10/tofu.c:2259
++#: g10/tofu.c:1727
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
@@@ -7013,61 -5472,51 +6953,61 @@@ msgstr "建立管道時出錯: %s\n
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
- #: g10/tofu.c:2351
++#: g10/tofu.c:1819
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
msgstr[0] ""
- #: g10/tofu.c:2360
++#: g10/tofu.c:1828
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
msgstr[0] ""
- #: g10/tofu.c:2369
++#: g10/tofu.c:1837
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
msgstr[0] ""
- #: g10/tofu.c:2378
++#: g10/tofu.c:1846
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
msgstr[0] ""
- #: g10/tofu.c:2387
++#: g10/tofu.c:1855
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
msgstr[0] ""
- #: g10/tofu.c:2396
++#: g10/tofu.c:1864
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
msgstr[0] ""
- #: g10/tofu.c:2484
++#: g10/tofu.c:1947
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2513
++#: g10/tofu.c:1976
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
- #: g10/tofu.c:2533
++#: g10/tofu.c:1996
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %ld messages signed by \"%s\"."
msgstr "印出訊息摘要"
- #: g10/tofu.c:2544
++#: g10/tofu.c:2007
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7077,20 -5526,16 +7017,20 @@@ msgid_plural "
"in the past %s."
msgstr[0] ""
- #: g10/tofu.c:2555
++#: g10/tofu.c:2018
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2603
++#: g10/tofu.c:2066
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2606
++#: g10/tofu.c:2069
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2614
++#: g10/tofu.c:2077
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7106,8 -5551,6 +7046,7 @@@ msgid_plural "
"to mark it as being bad.\n"
msgstr[0] ""
- #: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
- #: g10/tofu.c:3058
++#: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error opening TOFU database: %s\n"
@@@ -7634,7 -5968,6 +7573,7 @@@ msgstr "|N|開始新增個人識別碼
msgid "run in multi server mode (foreground)"
msgstr "以多重伺服器模式執行 (前景)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|等級|設定除錯等級為指定等級"
@@@ -7686,16 -6008,13 +7625,16 @@@ msgstr "
"語法: scdaemon [選項] [指令 [引數]]\n"
"@GNUPG@ 智慧卡服務\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:785
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr "請使用 '--daemon' 選項來將此程式執行於背景\n"
- #: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
#, c-format
msgid "handler for fd %d started\n"
msgstr "用於 fd %d 的經手程式已啟動\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "用於 fd %d 的經手程式已終止\n"
@@@ -7796,12 -6092,10 +7735,12 @@@ msgstr "請確認 \"dirmngr\" 已安裝
msgid "checking the CRL failed: %s"
msgstr "檢查 CRL 時失敗: %s"
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
++#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
#, c-format
msgid "certificate with invalid validity: %s"
msgstr "有效性無效的憑證: %s"
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
++#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
msgid "certificate not yet valid"
msgstr "憑證尚未生效"
@@@ -7813,7 -6105,6 +7752,7 @@@ msgstr "根憑證尚未生效
msgid "intermediate certificate not yet valid"
msgstr "媒介憑證尚未生效"
- #: sm/certchain.c:1068 dirmngr/validate.c:502
++#: sm/certchain.c:1068 dirmngr/validate.c:498
msgid "certificate has expired"
msgstr "憑證已過期"
@@@ -7862,7 -6142,6 +7801,7 @@@ msgstr " (憑證有效自
msgid " ( issuer valid from "
msgstr " ( 發行者有效自 "
- #: sm/certchain.c:1200 dirmngr/validate.c:552
++#: sm/certchain.c:1200 dirmngr/validate.c:548
#, c-format
msgid "fingerprint=%s\n"
msgstr "指紋=%s\n"
@@@ -7891,7 -6164,6 +7830,7 @@@ msgstr "憑證中找不到發行者
msgid "self-signed certificate has a BAD signature"
msgstr "自簽憑證有 不良 簽章"
- #: sm/certchain.c:1497 dirmngr/validate.c:550
++#: sm/certchain.c:1497 dirmngr/validate.c:546
msgid "root certificate is not marked trusted"
msgstr "根憑證未標記為已信任"
@@@ -7900,28 -6171,22 +7839,28 @@@
msgid "checking the trust list failed: %s\n"
msgstr "檢查信任清單時失敗: %s\n"
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
++#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
msgid "certificate chain too long\n"
msgstr "憑證鏈太長\n"
- #: sm/certchain.c:1556 dirmngr/validate.c:617
++#: sm/certchain.c:1556 dirmngr/validate.c:613
msgid "issuer certificate not found"
msgstr "找不到發行者憑證"
- #: sm/certchain.c:1589 dirmngr/validate.c:643
++#: sm/certchain.c:1589 dirmngr/validate.c:639
msgid "certificate has a BAD signature"
msgstr "憑證有 不良 簽章"
- #: sm/certchain.c:1621 dirmngr/validate.c:667
++#: sm/certchain.c:1621 dirmngr/validate.c:663
msgid "found another possible matching CA certificate - trying again"
msgstr "找到了另一個可能吻合的 CA 憑證 - 正再試一次"
- #: sm/certchain.c:1680 dirmngr/validate.c:692
++#: sm/certchain.c:1680 dirmngr/validate.c:688
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr "憑證鏈比 CA 所允許的 (%d) 還長"
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
++#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
msgid "certificate is good\n"
msgstr "憑證完好\n"
@@@ -7951,7 -6210,6 +7890,7 @@@ msgstr "%u 位元的雜湊對 %u 位元
msgid "(this is the MD2 algorithm)\n"
msgstr "(這是 MD2 演算法)\n"
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
msgid "none"
msgstr "無"
@@@ -7985,36 -6238,28 +7924,36 @@@ msgstr "
"S/N %s, ID 0x%08lX,\n"
"建立於 %s, 於 %s 到期.\n"
- #: sm/certlist.c:122 dirmngr/validate.c:1079
++#: sm/certlist.c:122 dirmngr/validate.c:1075
msgid "no key usage specified - assuming all usages\n"
msgstr "沒有指定的金鑰用途 - 假設為所有的用途\n"
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "取得金鑰用途資訊時出錯: %s\n"
- #: sm/certlist.c:142 dirmngr/validate.c:1099
++#: sm/certlist.c:142 dirmngr/validate.c:1095
msgid "certificate should not have been used for certification\n"
msgstr "憑證應該還未被用於憑證\n"
- #: sm/certlist.c:154 dirmngr/validate.c:1111
++#: sm/certlist.c:154 dirmngr/validate.c:1107
msgid "certificate should not have been used for OCSP response signing\n"
msgstr "憑證應該還未被用於 OCSP 回應簽署\n"
- #: sm/certlist.c:165 dirmngr/validate.c:1131
++#: sm/certlist.c:165 dirmngr/validate.c:1127
msgid "certificate should not have been used for encryption\n"
msgstr "憑證應該還未被用於加密\n"
- #: sm/certlist.c:166 dirmngr/validate.c:1133
++#: sm/certlist.c:166 dirmngr/validate.c:1129
msgid "certificate should not have been used for signing\n"
msgstr "憑證應該還未被用於簽署\n"
- #: sm/certlist.c:167 dirmngr/validate.c:1134
++#: sm/certlist.c:167 dirmngr/validate.c:1130
msgid "certificate is not usable for encryption\n"
msgstr "憑證無法用於加密\n"
- #: sm/certlist.c:168 dirmngr/validate.c:1135
++#: sm/certlist.c:168 dirmngr/validate.c:1131
msgid "certificate is not usable for signing\n"
msgstr "憑證無法用於簽署\n"
@@@ -8430,21 -6585,17 +8369,21 @@@ msgstr "%s:%u: 給定的密碼沒有使
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: 正在跳過這一列\n"
- #: sm/gpgsm.c:1433
++#: sm/gpgsm.c:1430
msgid "could not parse keyserver\n"
msgstr "無法剖析金鑰伺服器\n"
- #: sm/gpgsm.c:1632
++#: sm/gpgsm.c:1629
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "正在匯入通用憑證 '%s'\n"
- #: sm/gpgsm.c:1673
++#: sm/gpgsm.c:1670
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "無法用 '%s' 來簽署: %s\n"
- #: sm/gpgsm.c:2029
++#: sm/gpgsm.c:2026
msgid "invalid command (there is no implicit command)\n"
msgstr "無效的指令 (沒有這樣的指令)\n"
@@@ -8505,7 -6644,6 +8444,7 @@@ msgstr "重新搜尋憑證的問題: %s
msgid "error storing flags: %s\n"
msgstr "存放旗標時出錯: %s\n"
- #: sm/keylist.c:658
++#: sm/keylist.c:657
msgid "Error - "
msgstr "錯誤 - "
@@@ -8626,93 -6743,69 +8565,88 @@@ msgstr "無法釋放憑證快取鎖定
msgid "dropping %u certificates from the cache\n"
msgstr "正在從快取中拋棄 %u 份憑證\n"
- #: dirmngr/certcache.c:352
- #, c-format
- msgid "can't access directory '%s': %s\n"
- msgstr "無法存取目錄 '%s': %s\n"
-
- #: dirmngr/certcache.c:390
++#: dirmngr/certcache.c:387
#, c-format
msgid "can't parse certificate '%s': %s\n"
msgstr "無法剖析憑證 '%s': %s\n"
- #: dirmngr/certcache.c:398
++#: dirmngr/certcache.c:395
#, c-format
msgid "certificate '%s' already cached\n"
msgstr "憑證 '%s' 已快取\n"
- #: dirmngr/certcache.c:402
++#: dirmngr/certcache.c:399
#, c-format
msgid "trusted certificate '%s' loaded\n"
msgstr "信任的憑證 '%s' 已載入\n"
- #: dirmngr/certcache.c:404
++#: dirmngr/certcache.c:401
#, c-format
msgid "certificate '%s' loaded\n"
msgstr "憑證 '%s' 已載入\n"
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:405
#, c-format
msgid " SHA1 fingerprint = %s\n"
msgstr " SHA1 指紋 = %s\n"
- #: dirmngr/certcache.c:411
++#: dirmngr/certcache.c:408
msgid " issuer ="
msgstr " 發行者 ="
- #: dirmngr/certcache.c:412
++#: dirmngr/certcache.c:409
msgid " subject ="
msgstr " 主旨 ="
- #: dirmngr/certcache.c:416
++#: dirmngr/certcache.c:413
#, c-format
msgid "error loading certificate '%s': %s\n"
msgstr "載入憑證 '%s' 時出錯: %s\n"
- #: dirmngr/certcache.c:492
++#: dirmngr/certcache.c:489
#, c-format
msgid "permanently loaded certificates: %u\n"
msgstr "固定載入的憑證: %u\n"
- #: dirmngr/certcache.c:494
++#: dirmngr/certcache.c:491
#, c-format
msgid " runtime cached certificates: %u\n"
msgstr " 執行時期快取的憑證: %u\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
msgid "certificate already cached\n"
msgstr "憑證早已快取\n"
- #: dirmngr/certcache.c:511
++#: dirmngr/certcache.c:508
msgid "certificate cached\n"
msgstr "憑證已快取\n"
- #: dirmngr/certcache.c:513 dirmngr/certcache.c:533
++#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
+#: dirmngr/dirmngr-client.c:389
#, c-format
msgid "error caching certificate: %s\n"
msgstr "快取憑證時出錯: %s\n"
- #: dirmngr/certcache.c:596
++#: dirmngr/certcache.c:593
#, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
msgstr "無效的 SHA1 指紋字串 '%s'\n"
- #: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
++#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
#, c-format
msgid "error fetching certificate by S/N: %s\n"
msgstr "以序號取得憑證時出錯: %s\n"
- #: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
++#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
#, c-format
msgid "error fetching certificate by subject: %s\n"
msgstr "以主旨取得憑證時出錯: %s\n"
- #: dirmngr/certcache.c:1318 dirmngr/validate.c:459
++#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
msgid "no issuer found in certificate\n"
msgstr "憑證中找不到發行者\n"
- #: dirmngr/certcache.c:1328
++#: dirmngr/certcache.c:1325
#, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
msgstr "取得 authorityKeyIdentifier 時出錯: %s\n"
@@@ -8966,7 -7008,6 +8900,7 @@@ msgstr "S/N %s 有效, 但位列入 CR
msgid "error getting data from cache file: %s\n"
msgstr "從快取檔案取得資料時出錯: %s\n"
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
#, c-format
msgid "unknown hash algorithm '%s'\n"
msgstr "未知的雜湊演算法 '%s'\n"
@@@ -8985,7 -7023,6 +8919,7 @@@ msgstr "從 libksba 得到無效的 S-�
msgid "converting S-expression failed: %s\n"
msgstr "轉換 S-表示式時失敗: %s\n"
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
#, c-format
msgid "creating S-expression failed: %s\n"
msgstr "建立 S-表示式時失敗: %s\n"
@@@ -9362,112 -7319,81 +9296,108 @@@ msgstr "應該要有絕對檔名\n
msgid "looking up '%s'\n"
msgstr "正在查找 '%s'\n"
- #: dirmngr/dirmngr.c:159
- msgid "run as windows service (background)"
- msgstr "以視窗服務模式執行 (背景)"
-
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:148
msgid "list the contents of the CRL cache"
msgstr "列出 CRL 快取的內容"
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:149
msgid "|FILE|load CRL from FILE into cache"
msgstr "|檔案|從指定檔案載入 CRL 至快取"
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:150
msgid "|URL|fetch a CRL from URL"
msgstr "|網址|從指定網址取得 CRL"
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:151
msgid "shutdown the dirmngr"
msgstr "關閉 dirmngr"
- #: dirmngr/dirmngr.c:165
++#: dirmngr/dirmngr.c:152
msgid "flush the cache"
msgstr "清除快取"
- #: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
msgid "|FILE|write server mode logs to FILE"
msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:168
msgid "run without asking a user"
msgstr "以不詢問使用者的方式執行"
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:169
msgid "force loading of outdated CRLs"
msgstr "強迫載入過時的 CRL"
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:170
msgid "allow sending OCSP requests"
msgstr "允許送出 OCSP 請求"
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:171
msgid "inhibit the use of HTTP"
msgstr "避免使用 HTTP"
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:172
msgid "inhibit the use of LDAP"
msgstr "避免使用 LDAP"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:174
msgid "ignore HTTP CRL distribution points"
msgstr "忽略 HTTP CRL 分布點"
- #: dirmngr/dirmngr.c:189
++#: dirmngr/dirmngr.c:176
msgid "ignore LDAP CRL distribution points"
msgstr "忽略 LDAP CRL 分布點"
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:178
msgid "ignore certificate contained OCSP service URLs"
msgstr "忽略含有 OCSP 伺服器網址的憑證"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:181
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|網址|重新導向所有對指定網址提出的 HTTP 請求"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:183
msgid "|HOST|use HOST for LDAP queries"
msgstr "|主機|指定 LDAP 查詢主機"
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:185
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "不要將主機備案與 --ldap-proxy 並用"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:188
msgid "|FILE|read LDAP server list from FILE"
msgstr "|檔案|從指定檔案讀取 LDAP 伺服器清單"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:190
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr "將從 CRL 分布點發現的新伺服器加入至伺服器清單"
- #: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|把 LDAP 逾時設成 N 秒"
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:196
msgid "|URL|use OCSP responder at URL"
msgstr "|網址|使用位於指定網址的 OCSP 回應程式"
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:198
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|由 FPR 簽署的 OCSP 回應"
- #: dirmngr/dirmngr.c:217
++#: dirmngr/dirmngr.c:204
msgid "|N|do not return more than N items in one query"
msgstr "|N|單次查詢不要傳回超過 N 筆項目"
- #: dirmngr/dirmngr.c:222
++#: dirmngr/dirmngr.c:209
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr "|檔案|在 HKP over TLS 的指定檔案中使用 CA 憑證"
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:211
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:241
++#: dirmngr/dirmngr.c:228
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9476,11 -7402,9 +9406,11 @@@ msgstr "
"@\n"
"(請參照「資訊」手冊來取得所有命令和選項的完整清單)\n"
- #: dirmngr/dirmngr.c:353
++#: dirmngr/dirmngr.c:340
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "用法: @DIRMNGR@ [選項] (或用 -h 求助)"
- #: dirmngr/dirmngr.c:355
++#: dirmngr/dirmngr.c:342
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9488,77 -7412,60 +9418,77 @@@ msgstr "
"語法: @DIRMNGR@ [選項] [指令 [引數]]\n"
"@GNUPG@ 的金鑰伺服器, CRL, OCSP 存取\n"
- #: dirmngr/dirmngr.c:435
++#: dirmngr/dirmngr.c:422
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "有效的除錯等級為: %s\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
- #: tools/gpgconf.c:404
++#: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
++#: tools/gpgconf.c:400
#, c-format
msgid "usage: %s [options] "
msgstr "用法: %s [選項] "
- #: dirmngr/dirmngr.c:1123
++#: dirmngr/dirmngr.c:1001
msgid "colons are not allowed in the socket name\n"
msgstr "socket 名稱內不允許使用冒號\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "從 '%s' 取回 CRL 時失敗: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "從 '%s' 處理 CRL 時失敗: %s\n"
- #: dirmngr/dirmngr.c:1594
++#: dirmngr/dirmngr.c:1418
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: 列太長 - 已跳過\n"
- #: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
++#: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: 偵測到無效的指紋\n"
- #: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
++#: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: 讀取錯誤: %s\n"
- #: dirmngr/dirmngr.c:1740
++#: dirmngr/dirmngr.c:1564
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: 列尾的垃圾已忽略\n"
- #: dirmngr/dirmngr.c:1807
++#: dirmngr/dirmngr.c:1631
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr "收到 SIGHUP - 正在重新讀取組態並清除快取\n"
- #: dirmngr/dirmngr.c:1834
++#: dirmngr/dirmngr.c:1658
msgid "SIGUSR2 received - no action defined\n"
msgstr "收到 SIGUSR2 - 無定義行動\n"
- #: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
++#: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
msgid "SIGTERM received - shutting down ...\n"
msgstr "收到 SIGTERM - 正在關閉 ...\n"
- #: dirmngr/dirmngr.c:1841
++#: dirmngr/dirmngr.c:1665
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "收到 SIGTERM - 還有 %d 個使用中的連線\n"
- #: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
++#: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
msgid "shutdown forced\n"
msgstr "已強迫關閉\n"
- #: dirmngr/dirmngr.c:1854
++#: dirmngr/dirmngr.c:1678
msgid "SIGINT received - immediate shutdown\n"
msgstr "收到 SIGINT - 立即關閉\n"
- #: dirmngr/dirmngr.c:1861
++#: dirmngr/dirmngr.c:1685
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "收到訊號 %d - 無定義行動\n"
@@@ -9890,98 -7727,77 +9820,98 @@@ msgstr "計算 '%s' OSCP 回應雜湊�
msgid "not signed by a default OCSP signer's certificate"
msgstr "並未由預設 OCSP 簽署者的憑證所簽署"
- #: dirmngr/ocsp.c:417
++#: dirmngr/ocsp.c:413
msgid "only SHA-1 is supported for OCSP responses\n"
msgstr "OCSP 回應僅支援 SHA-1\n"
- #: dirmngr/ocsp.c:468
++#: dirmngr/ocsp.c:464
#, c-format
msgid "allocating list item failed: %s\n"
msgstr "配置清單項目時失敗: %s\n"
- #: dirmngr/ocsp.c:483
++#: dirmngr/ocsp.c:479
#, c-format
msgid "error getting responder ID: %s\n"
msgstr "取得回應程式 ID 時出錯: %s\n"
- #: dirmngr/ocsp.c:518
++#: dirmngr/ocsp.c:514
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr "找不到適合用來驗證 OCSP 回應的憑證\n"
- #: dirmngr/ocsp.c:557 dirmngr/validate.c:623
++#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
#, c-format
msgid "issuer certificate not found: %s\n"
msgstr "找不到發行者憑證: %s\n"
- #: dirmngr/ocsp.c:567
++#: dirmngr/ocsp.c:563
msgid "caller did not return the target certificate\n"
msgstr "叫用者未傳為目標憑證\n"
- #: dirmngr/ocsp.c:574
++#: dirmngr/ocsp.c:570
msgid "caller did not return the issuing certificate\n"
msgstr "叫用者未傳回發行的憑證\n"
- #: dirmngr/ocsp.c:584
++#: dirmngr/ocsp.c:580
#, c-format
msgid "failed to allocate OCSP context: %s\n"
msgstr "配置 OCSP 脈絡失敗: %s\n"
- #: dirmngr/ocsp.c:618
++#: dirmngr/ocsp.c:614
#, c-format
msgid "can't get authorityInfoAccess: %s\n"
msgstr "無法取得 authorityInfoAccess: %s\n"
- #: dirmngr/ocsp.c:625
++#: dirmngr/ocsp.c:621
msgid "no default OCSP responder defined\n"
msgstr "無定義預設 OCSP 回應程式\n"
- #: dirmngr/ocsp.c:631
++#: dirmngr/ocsp.c:627
msgid "no default OCSP signer defined\n"
msgstr "未定義預設的 OCSP 簽署程式\n"
- #: dirmngr/ocsp.c:638
++#: dirmngr/ocsp.c:634
#, c-format
msgid "using default OCSP responder '%s'\n"
msgstr "正在使用預設的 OCSP 回應程式 '%s'\n"
- #: dirmngr/ocsp.c:643
++#: dirmngr/ocsp.c:639
#, c-format
msgid "using OCSP responder '%s'\n"
msgstr "正在使用 %s OCSP 回應程式\n"
- #: dirmngr/ocsp.c:650
++#: dirmngr/ocsp.c:646
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
msgstr "對 OCSP 建立雜湊脈絡失敗: %s\n"
- #: dirmngr/ocsp.c:680
++#: dirmngr/ocsp.c:676
#, c-format
msgid "error getting OCSP status for target certificate: %s\n"
msgstr "取得目標憑證 OCSP 狀態時出錯: %s\n"
- #: dirmngr/ocsp.c:705
++#: dirmngr/ocsp.c:701
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
msgstr "憑證狀態為: %s (本次=%s 下次=%s)\n"
- #: dirmngr/ocsp.c:706
++#: dirmngr/ocsp.c:702
msgid "good"
msgstr "良好"
- #: dirmngr/ocsp.c:712
++#: dirmngr/ocsp.c:708
#, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
msgstr "憑證已撤銷於 %s 因: %s\n"
- #: dirmngr/ocsp.c:747
++#: dirmngr/ocsp.c:743
msgid "OCSP responder returned a status in the future\n"
msgstr "OCSP 回應程式傳回未來的狀態\n"
- #: dirmngr/ocsp.c:759
++#: dirmngr/ocsp.c:755
msgid "OCSP responder returned a non-current status\n"
msgstr "OCSP 回應程式傳回非當下的狀態\n"
- #: dirmngr/ocsp.c:774
++#: dirmngr/ocsp.c:770
msgid "OCSP responder returned an too old status\n"
msgstr "OCSP 回應程式傳回老舊的狀態\n"
@@@ -10029,32 -7835,26 +9959,32 @@@ msgstr "fetch_next_cert 失敗: %s\n
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d 已超出\n"
- #: dirmngr/server.c:2404
++#: dirmngr/server.c:2366
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "無法配置控制結構: %s\n"
- #: dirmngr/server.c:2415
++#: dirmngr/server.c:2377
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "配置 assuan 脈絡失敗: %s\n"
- #: dirmngr/server.c:2436
++#: dirmngr/server.c:2398
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "伺服器啟始失敗: %s\n"
- #: dirmngr/server.c:2444
++#: dirmngr/server.c:2406
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "向 Assuan 註冊指令時失敗: %s\n"
- #: dirmngr/server.c:2475
++#: dirmngr/server.c:2437
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan 接受問題: %s\n"
- #: dirmngr/server.c:2494
++#: dirmngr/server.c:2456
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuan 處理時失敗: %s\n"
@@@ -10075,32 -7871,22 +10005,28 @@@ msgstr "不對此檢查 CRL:
msgid "checking CRL for"
msgstr "檢查 CRL: "
- #: dirmngr/validate.c:388
- msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr "正在以相容模式執行 - 憑證鏈未檢查!\n"
-
- #: dirmngr/validate.c:532
++#: dirmngr/validate.c:528
msgid "selfsigned certificate has a BAD signature"
msgstr "自簽憑證有 不良 簽章"
- #: dirmngr/validate.c:565
++#: dirmngr/validate.c:561
#, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr "檢查根憑證可信度時失敗: %s\n"
- #: dirmngr/validate.c:742
++#: dirmngr/validate.c:738
msgid "certificate chain is good\n"
msgstr "憑證鏈完好\n"
- #: dirmngr/validate.c:972
++#: dirmngr/validate.c:968
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA 要求使用 160 位元的雜湊演算法\n"
- #: dirmngr/validate.c:1120
++#: dirmngr/validate.c:1116
msgid "certificate should not have been used for CRL signing\n"
msgstr "憑證應該還未被用於 CRL 簽署\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
msgid "quiet"
msgstr "安靜模式"
@@@ -10226,11 -7981,9 +10152,11 @@@ msgstr "|N|把 SSH 金鑰最大生存�
msgid "Options enforcing a passphrase policy"
msgstr "強制執行密語原則的選項"
+#: tools/gpgconf-comp.c:563
- msgid "do not allow to bypass the passphrase policy"
+ msgid "do not allow bypassing the passphrase policy"
msgstr "不允許略過密語原則"
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|把新密語所需的最短長度設成 N"
@@@ -10367,67 -8088,51 +10293,67 @@@ msgstr "元件 %s 的外部驗證失敗
msgid "Note that group specifications are ignored\n"
msgstr "請注意群組規格已忽略\n"
- #: tools/gpgconf.c:68
++#: tools/gpgconf.c:69
msgid "list all components"
msgstr "列出所有的元件"
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:70
msgid "check all programs"
msgstr "檢查所有的程式"
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:71
msgid "|COMPONENT|list options"
msgstr "|元件|列出選項"
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:72
msgid "|COMPONENT|change options"
msgstr "|元件|變更選項"
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:73
msgid "|COMPONENT|check options"
msgstr "|元件|檢查選項"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:75
msgid "apply global default values"
msgstr "套用全域預設值"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:77
msgid "get the configuration directories for @GPGCONF@"
msgstr "取得 @GPGCONF@ 的組態目錄"
- #: tools/gpgconf.c:78
++#: tools/gpgconf.c:79
msgid "list global configuration file"
msgstr "列出全域組態檔"
- #: tools/gpgconf.c:80
++#: tools/gpgconf.c:81
msgid "check global configuration file"
msgstr "檢查全域組態檔案"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:82
msgid "reload all or a given component"
msgstr "重新載入所有或給定的元件"
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:83
msgid "launch a given component"
msgstr "啟動給定的元件"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:84
msgid "kill a given component"
msgstr "刪除給定的元件"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:90
msgid "use as output file"
msgstr "當作輸出檔案來使用"
- #: tools/gpgconf.c:93
++#: tools/gpgconf.c:94
msgid "activate changes at runtime, if possible"
msgstr "如果可能的話, 在執行期啟用變更"
- #: tools/gpgconf.c:116
++#: tools/gpgconf.c:118
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "用法: @GPGCONF@ [選項] (或用 -h 求助)"
- #: tools/gpgconf.c:119
++#: tools/gpgconf.c:121
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10435,15 -8140,12 +10361,15 @@@ msgstr "
"語法: @GPGCONF@ [選項]\n"
"管理 @GNUPG@ 系統工具的組態選項\n"
- #: tools/gpgconf.c:301 tools/gpgconf.c:335
++#: tools/gpgconf.c:297 tools/gpgconf.c:331
msgid "Need one component argument"
msgstr "需要一個元件引數"
- #: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
++#: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
msgid "Component not found"
msgstr "找不到元件"
- #: tools/gpgconf.c:406
++#: tools/gpgconf.c:402
msgid "No argument allowed"
msgstr "未允許使用引數"
@@@ -10495,122 -8188,97 +10421,122 @@@ msgstr "
"令 [輸入檔案]\n"
"叫用單純對稱式加密工具\n"
- #: tools/symcryptrun.c:281
++#: tools/symcryptrun.c:278
#, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s 於 %s 以 %i 狀態中止了\n"
- #: tools/symcryptrun.c:288
++#: tools/symcryptrun.c:285
#, c-format
msgid "%s on %s failed with status %i\n"
msgstr "%s 於 %s 以 %i 狀態失敗了\n"
- #: tools/symcryptrun.c:320
++#: tools/symcryptrun.c:317
#, c-format
msgid "can't create temporary directory '%s': %s\n"
msgstr "無法建立暫存目錄 '%s': %s\n"
- #: tools/symcryptrun.c:360 tools/symcryptrun.c:377
++#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr "無法開啟 %s 來寫入: %s\n"
- #: tools/symcryptrun.c:388
++#: tools/symcryptrun.c:385
#, c-format
msgid "error writing to %s: %s\n"
msgstr "寫入 %s 時出錯: %s\n"
- #: tools/symcryptrun.c:395
++#: tools/symcryptrun.c:392
#, c-format
msgid "error reading from %s: %s\n"
msgstr "讀取 %s 時出錯: %s\n"
- #: tools/symcryptrun.c:402 tools/symcryptrun.c:409
++#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
#, c-format
msgid "error closing %s: %s\n"
msgstr "關閉 %s 時出錯: %s\n"
- #: tools/symcryptrun.c:494
++#: tools/symcryptrun.c:490
msgid "no --program option provided\n"
msgstr "沒有提供 --program 選項\n"
- #: tools/symcryptrun.c:500
++#: tools/symcryptrun.c:496
msgid "only --decrypt and --encrypt are supported\n"
msgstr "祇支援 --decrypt 和 --encrypt\n"
- #: tools/symcryptrun.c:506
++#: tools/symcryptrun.c:502
msgid "no --keyfile option provided\n"
msgstr "沒有提供 --keyfile 選項\n"
- #: tools/symcryptrun.c:517
++#: tools/symcryptrun.c:513
msgid "cannot allocate args vector\n"
msgstr "無法配置引數向量\n"
- #: tools/symcryptrun.c:535
++#: tools/symcryptrun.c:531
#, c-format
msgid "could not create pipe: %s\n"
msgstr "無法建立管道: %s\n"
- #: tools/symcryptrun.c:542
++#: tools/symcryptrun.c:538
#, c-format
msgid "could not create pty: %s\n"
msgstr "無法建立 pty: %s\n"
- #: tools/symcryptrun.c:558
++#: tools/symcryptrun.c:554
#, c-format
msgid "could not fork: %s\n"
msgstr "無法衍生: %s\n"
- #: tools/symcryptrun.c:586
++#: tools/symcryptrun.c:582
#, c-format
msgid "execv failed: %s\n"
msgstr "execv 失敗: %s\n"
- #: tools/symcryptrun.c:615
++#: tools/symcryptrun.c:611
#, c-format
msgid "select failed: %s\n"
msgstr "挑選失敗: %s\n"
- #: tools/symcryptrun.c:632
++#: tools/symcryptrun.c:628
#, c-format
msgid "read failed: %s\n"
msgstr "讀取失敗: %s\n"
- #: tools/symcryptrun.c:684
++#: tools/symcryptrun.c:680
#, c-format
msgid "pty read failed: %s\n"
msgstr "pty 讀取失敗: %s\n"
- #: tools/symcryptrun.c:736
++#: tools/symcryptrun.c:732
#, c-format
msgid "waitpid failed: %s\n"
msgstr "waitpid 失敗: %s\n"
- #: tools/symcryptrun.c:750
++#: tools/symcryptrun.c:746
#, c-format
msgid "child aborted with status %i\n"
msgstr "子代以 %i 狀態中止了\n"
- #: tools/symcryptrun.c:805
++#: tools/symcryptrun.c:801
#, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "無法配置檔內字串: %s\n"
- #: tools/symcryptrun.c:818
++#: tools/symcryptrun.c:814
#, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "無法配置檔外字串: %s\n"
- #: tools/symcryptrun.c:991
++#: tools/symcryptrun.c:987
#, c-format
msgid "either %s or %s must be given\n"
msgstr "一定要給定 %s 或 %s 其中之一\n"
- #: tools/symcryptrun.c:1018
++#: tools/symcryptrun.c:1009
msgid "no class provided\n"
msgstr "沒有提供類別\n"
- #: tools/symcryptrun.c:1027
++#: tools/symcryptrun.c:1018
#, c-format
msgid "class %s is not supported\n"
msgstr "未支援 %s 類別\n"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list